Rename twistedreactor -> twisted

diff --git a/tornado/platform/twistedreactor.py b/tornado/platform/twisted.py
similarity index 99%
rename from tornado/platform/twistedreactor.py
rename to tornado/platform/twisted.py
index acf2844c4c183b20d4e2e94ecdf1df299d695c46..680d2aa5391abe637034cb40d34df3d5d8e8efc7 100644 (file)
--- a/tornado/platform/twistedreactor.py
+++ b/tornado/platform/twisted.py
@@ -18,8 +18,8 @@ A twisted-style reactor for the Tornado IOLoop.
 
 To use it, add the following to your twisted application:
 
-import tornado.platform.twistedreactor
-tornado.platform.twistedreactor.install()
+import tornado.platform.twisted
+tornado.platform.twisted.install()
 from twisted.internet import reactor
 """
 

diff --git a/tornado/test/import_test.py b/tornado/test/import_test.py
index 59734503a578466a4ac2d67ced595a03e057a994..b146eb90e7f413408bc0802d732dba1984d48ac0 100644 (file)
--- a/tornado/test/import_test.py
+++ b/tornado/test/import_test.py
@@ -9,7 +9,6 @@ class ImportTest(unittest.TestCase):
         import tornado.autoreload
         # import tornado.curl_httpclient  # depends on pycurl
         # import tornado.database  # depends on MySQLdb
-        # import tornado.platform.twistedreactor # depends on twisted
         import tornado.escape
         import tornado.httpclient
         import tornado.httpserver
@@ -19,6 +18,7 @@ class ImportTest(unittest.TestCase):
         import tornado.locale
         import tornado.options
         import tornado.netutil
+        # import tornado.platform.twisted # depends on twisted
         import tornado.process
         import tornado.simple_httpclient
         import tornado.stack_context

diff --git a/tornado/test/runtests.py b/tornado/test/runtests.py
index cbaa068d8c90e5d8e1e0a5b713a30a97894c0807..efca8e6d3010114292609c914c1083b410c32837 100755 (executable)
--- a/tornado/test/runtests.py
+++ b/tornado/test/runtests.py
@@ -18,7 +18,7 @@ TEST_MODULES = [
     'tornado.test.stack_context_test',
     'tornado.test.template_test',
     'tornado.test.testing_test',
-    'tornado.test.twistedreactor_test',
+    'tornado.test.twisted_test',
     'tornado.test.web_test',
     'tornado.test.wsgi_test',
 ]

diff --git a/tornado/test/twistedreactor_test.py b/tornado/test/twisted_test.py
similarity index 98%
rename from tornado/test/twistedreactor_test.py
rename to tornado/test/twisted_test.py
index 8d3738c9695a66a8e3c0d463c0ac27e427dda6da..e182f264499c0a4cf578e111d9340103fed91a1c 100644 (file)
--- a/tornado/test/twistedreactor_test.py
+++ b/tornado/test/twisted_test.py
@@ -27,7 +27,7 @@ import unittest
 try:
     import twisted
     from twisted.internet.interfaces import IReadDescriptor, IWriteDescriptor
-    from tornado.platform.twistedreactor import TornadoReactor
+    from tornado.platform.twisted import TornadoReactor
     from zope.interface import implements
 except ImportError:
     twisted = None
@@ -304,7 +304,7 @@ else:
         except (ImportError, AttributeError):
             continue
         class TornadoTest(test):
-            _reactors = ["tornado.platform.twistedreactor._TestReactor"]
+            _reactors = ["tornado.platform.twisted._TestReactor"]
         TornadoTest.__name__ = test.__name__
         globals().update(TornadoTest.makeTestCaseClasses())