Skip to content

Commit

Permalink
Revert "Remove optional setuptools import."
Browse files Browse the repository at this point in the history
This reverts commit 50b28c5.

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.
  • Loading branch information
bdarnell committed Feb 20, 2012
1 parent 530731c commit 3b181f5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
6 changes: 6 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {}

Expand Down
1 change: 0 additions & 1 deletion website/sphinx/releases/next.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3b181f5

Please sign in to comment.