From: Ben Darnell <ben@bendarnell.com>
Date: Sat, 9 Mar 2013 00:03:49 +0000 (-0500)
Subject: Fix TwistedIOLoop on python 2.6.
X-Git-Tag: v3.0.0~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7431ffe1a0040b77087f63c0a9f29d3f7929ec72;p=thirdparty%2Ftornado.git

Fix TwistedIOLoop on python 2.6.
---

diff --git a/tornado/platform/twisted.py b/tornado/platform/twisted.py
index 240997f0c..3cd7b4b5b 100644
--- a/tornado/platform/twisted.py
+++ b/tornado/platform/twisted.py
@@ -472,7 +472,7 @@ class TwistedIOLoop(tornado.ioloop.IOLoop):
         if isinstance(deadline, (int, long, float)):
             delay = max(deadline - self.time(), 0)
         elif isinstance(deadline, datetime.timedelta):
-            delay = deadline.total_seconds()
+            delay = tornado.ioloop._Timeout.timedelta_to_seconds(deadline)
         else:
             raise TypeError("Unsupported deadline %r")
         return self.reactor.callLater(delay, self._run_callback, wrap(callback))
diff --git a/tox.ini b/tox.ini
index e84a50e22..fa4a46d55 100644
--- a/tox.ini
+++ b/tox.ini
@@ -71,6 +71,16 @@ deps =
      twisted>=12.0.0
 commands = python -m tornado.test.runtests --ioloop=tornado.platform.select.SelectIOLoop {posargs:}
 
+[testenv:py26-twisted]
+basepython = python2.6
+deps =
+     futures
+     mock
+     pycurl
+     twisted>=12.3.0
+     unittest2
+commands = python -m tornado.test.runtests --ioloop=tornado.platform.twisted.TwistedIOLoop {posargs:}
+
 [testenv:py27-twisted]
 basepython = python2.7
 deps =