Merge branch 'master' into python-3.3-to-3.5

setup.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+import setuptools
 import sys
 
 """Setup script for the 'uncompyle6' distribution."""
@@ -39,9 +40,7 @@ from __pkginfo__ import (
     zip_safe,
 )
 
-from setuptools import setup, find_packages
-
-setup(
+setuptools.setup(
     author=author,
     author_email=author_email,
     classifiers=classifiers,
@@ -52,7 +51,7 @@ setup(
     long_description=long_description,
     long_description_content_type="text/x-rst",
     name=modname,
-    packages=find_packages(),
+    packages=setuptools.find_packages(),
     py_modules=py_modules,
     test_suite="nose.collector",
     url=web,