Make twisted tests run under python 2.5

diff --git a/tornado/platform/twistedreactor.py b/tornado/platform/twistedreactor.py
index 40d7ea652d2575f45d14be67b10c59e88c85f916..57a59862159d0e4ae3432c453fb1adb160cb7fea 100644 (file)
--- a/tornado/platform/twistedreactor.py
+++ b/tornado/platform/twistedreactor.py
@@ -23,6 +23,8 @@ tornado.platform.twistedreactor.install()
 from twisted.internet import reactor
 """
 
+from __future__ import with_statement, absolute_import
+
 import functools
 import logging
 import sys

diff --git a/tornado/test/twistedreactor_test.py b/tornado/test/twistedreactor_test.py
index 0e72ccfe9b5873808f6e7c2d2d8d8a32919ae972..dc26cbfcf19d76ca60261272a287eb6a5bffd5cc 100644 (file)
--- a/tornado/test/twistedreactor_test.py
+++ b/tornado/test/twistedreactor_test.py
@@ -116,7 +116,9 @@ class ReactorCallFromThreadTest(unittest.TestCase):
         self._thread.join()
 
     def _newThreadRun(self):
-        self.assertEqual(self._thread.ident, thread.get_ident())
+        self.assertNotEqual(self._mainThread, thread.get_ident())
+        if hasattr(self._thread, 'ident'):  # new in python 2.6
+            self.assertEqual(self._thread.ident, thread.get_ident())
         self._reactor.callFromThread(self._fnCalledFromThread)
 
     def _fnCalledFromThread(self):