Merge remote-tracking branch 'dcoppa/master'

1 files changed, 5 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index 6d019dcbb..eb7b1a212 100644
--- a/setup.py
+++ b/setup.py
@@ -2,11 +2,15 @@
 # -*- 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"""
 except ImportError: