From 7431ffe1a0040b77087f63c0a9f29d3f7929ec72 Mon Sep 17 00:00:00 2001 From: Ben Darnell Date: Fri, 8 Mar 2013 19:03:49 -0500 Subject: [PATCH] Fix TwistedIOLoop on python 2.6. --- tornado/platform/twisted.py | 2 +- tox.ini | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/tornado/platform/twisted.py b/tornado/platform/twisted.py index 240997f0..3cd7b4b5 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 e84a50e2..fa4a46d5 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 =