Merge remote-tracking branch 'dcoppa/master'

2013-02-01 18:05:42 +01:00 · 2013-02-01 18:05:42 +01:00 · c7a725cfad
commit c7a725cfad
parent 450a30cae8 a32b573ccb
1 changed files with 5 additions and 1 deletions
--- a/setup.py
+++ b/setup.py
@ -2,10 +2,14 @@
 # -*- coding: utf-8 -*-

 from __future__ import print_function
-from distutils.core import setup
 import pkg_resources
 import sys

+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
+
 try:
    import py2exe
    """This will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package"""