Revert "Remove optional setuptools import."

This reverts commit 50b28c5d7a1ccfc3cc3a5a8fc5cf664880598fc6.

Turns out we do need setuptools in at least one situation:
distutils chokes if there are broken symlinks anywhere in the source
tree, but in testing with a VM there may be "broken" symlinks that point
outside the directory shared with the VM.

diff --git a/setup.py b/setup.py
index 91e5593317d61f1f565627e3b89a8751322e03a3..872c737c4c285ff94413aca065929bcd670157ea 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -16,6 +16,12 @@
 
 import distutils.core
 import sys
+# Importing setuptools adds some features like "setup.py develop", but
+# it's optional so swallow the error if it's not there.
+try:
+    import setuptools
+except ImportError:
+    pass
 
 kwargs = {}
 

diff --git a/website/sphinx/releases/next.rst b/website/sphinx/releases/next.rst
index 365e48b783d53194409dad661bdc7693e5d8faf9..080bd9ec5e288e1d0f2beafdda7162222c29981b 100644 (file)
--- a/website/sphinx/releases/next.rst
+++ b/website/sphinx/releases/next.rst
@@ -4,7 +4,6 @@ What's new in the next version of Tornado
 In progress
 -----------
 
-* ``setup.py`` no longer imports setuptools on Python 2.x.
 * Colored logging configuration in `tornado.options` is compatible with
   the upcoming release of Python 3.3.
 * `tornado.simple_httpclient` is better about closing its sockets