From 2b4a5838aa341d09945c13f2de5d58743c2e609e Mon Sep 17 00:00:00 2001 From: itamarst Date: Fri, 28 Sep 2012 18:58:23 +0000 Subject: [PATCH] Merge testthreads-py3-6018 Author: itamar Review: exarkun Fixes: #6018 twisted.internet.test.test_threads now runs on Python 3. git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@35836 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb --- admin/_twistedpython3.py | 1 + twisted/internet/test/test_threads.py | 2 ++ twisted/topfiles/6018.misc | 0 3 files changed, 3 insertions(+) create mode 100644 twisted/topfiles/6018.misc diff --git a/admin/_twistedpython3.py b/admin/_twistedpython3.py index 0e68d918e80..1d6806de8da 100644 --- a/admin/_twistedpython3.py +++ b/admin/_twistedpython3.py @@ -73,6 +73,7 @@ "twisted.internet.test.test_filedescriptor", "twisted.internet.test.test_main", "twisted.internet.test.test_sigchld", + "twisted.internet.test.test_threads", "twisted.python.test.test_components", "twisted.python.test.test_deprecatepy3", "twisted.python.test.test_reflectpy3", diff --git a/twisted/internet/test/test_threads.py b/twisted/internet/test/test_threads.py index 00683a317bd..1436918c915 100644 --- a/twisted/internet/test/test_threads.py +++ b/twisted/internet/test/test_threads.py @@ -5,6 +5,8 @@ Tests for implementations of L{IReactorThreads}. """ +from __future__ import division, absolute_import + __metaclass__ = type from weakref import ref diff --git a/twisted/topfiles/6018.misc b/twisted/topfiles/6018.misc new file mode 100644 index 00000000000..e69de29bb2d