From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 19 Jan 2014 23:55:53 +0000 (-0500)
Subject: Remove some vestigial references to 2to3.
X-Git-Tag: v4.0.0b1~142
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=665bd981df22b6fdd6d967607f1676a06f0688c2;p=thirdparty%2Ftornado.git

Remove some vestigial references to 2to3.
---

diff --git a/maint/test/websocket/tox.ini b/maint/test/websocket/tox.ini
index 0d89c0f32..696074102 100644
--- a/maint/test/websocket/tox.ini
+++ b/maint/test/websocket/tox.ini
@@ -1,5 +1,5 @@
 # We don't actually use tox to run this test, but it's the easiest way
-# to install autobahn and deal with 2to3 for the python3 version.
+# to install autobahn and build the speedups module.
 # See run.sh for the real test runner.
 [tox]
 envlist = py27, py32, py26, pypy
diff --git a/runtests.sh b/runtests.sh
index 4058c0243..d314fc102 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -3,10 +3,6 @@
 #
 # Also consider using tox, which uses virtualenv to run the test suite
 # under multiple versions of python.
-#
-# This script requires that `python` is python 2.x; to run the tests under
-# python 3 tornado must be installed so that 2to3 is run.  The easiest
-# way to run the tests under python 3 is with tox: "tox -e py32".
 
 cd $(dirname $0)
 
diff --git a/tox.ini b/tox.ini
index 1fdedac26..abf1756ee 100644
--- a/tox.ini
+++ b/tox.ini
@@ -44,7 +44,7 @@ commands = python -m tornado.test.runtests {posargs:}
 
 # python will import relative to the current working directory by default,
 # so cd into the tox working directory to avoid picking up the working
-# copy of the files (especially important for 2to3).
+# copy of the files (especially important for the speedups module).
 changedir = {toxworkdir}
 
 # tox 1.6 passes --pre to pip by default, which currently has problems