Merge remote-tracking branch 'dcoppa/master'

diff --git a/setup.py b/setup.py
index 6d019dcbb6e24a982611a2e26be1b62997bc2bf3..eb7b1a2121632f66f6b7d9b5d829cd9eaf46ccb5 100644 (file)
--- 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"""