Permalink
Browse files

Rename twistedreactor -> twisted

  • Loading branch information...
1 parent 1264faa commit 27951ad13c3c89ee122793c2743a4df37b9ecdbb @bdarnell committed Jul 17, 2011
View
4 tornado/platform/twistedreactor.py → tornado/platform/twisted.py
@@ -18,8 +18,8 @@
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
"""
View
2 tornado/test/import_test.py
@@ -9,7 +9,6 @@ def test_import_everything(self):
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 @@ def test_import_everything(self):
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
View
2 tornado/test/runtests.py
@@ -18,7 +18,7 @@
'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',
]
View
4 tornado/test/twistedreactor_test.py → tornado/test/twisted_test.py
@@ -27,7 +27,7 @@
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 @@ def testNoWriter(self):
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())

0 comments on commit 27951ad

Please sign in to comment.