Merge branch '1.15' into 1.16

2 files changed, 10 insertions, 17 deletions

diff --git a/setup.py b/setup.py
index f9c4b4fe..ad957329 100644
--- a/setup.py
+++ b/setup.py
@@ -31,23 +31,10 @@ To install the `in-development version
 `pip install paramiko==dev`.
 '''
 
-# if someday we want to *require* setuptools, uncomment this:
-# (it will cause setuptools to be automatically downloaded)
-#import ez_setup
-#ez_setup.use_setuptools()
-
 import sys
-try:
-    from setuptools import setup
-    kw = {
-        'install_requires': [
-            'pycrypto>=2.1,!=2.4',
-            'ecdsa>=0.11',
-        ],
-    }
-except ImportError:
-    from distutils.core import setup
-    kw = {}
+
+from setuptools import setup
+
 
 if sys.platform == 'darwin':
     import setup_helper
@@ -89,5 +76,8 @@ setup(
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
     ],
-    **kw
+    install_requires=[
+        'pycrypto>=2.1,!=2.4',
+        'ecdsa>=0.11',
+    ],
 )
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index e7c420da..95e8d055 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
 Changelog
 =========
 
+* :support:`729 backported` Clean up ``setup.py`` to always use ``setuptools``,
+  not doing so was a historical artifact from bygone days. Thanks to Alex
+  Gaynor.
 * :bug:`617` (aka `fabric/fabric#1429
   <https://github.com/fabric/fabric/issues/1429>`_; via :issue:`679`; related:
   :issue:`678`, :issue:`685`, :issue:`615` & :issue:`616`) Fix up