Merge reactors-py3-6068.

Author: itamar Review: exarkun Fixes: twisted#6068 select, poll and epoll reactors are deemed to be sufficiently working on Python 3, given passing TCP, UDP and fdset tests. git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@36155 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
daftshady · Oct 15, 2012 · 4f44362 · 4f44362
1 parent dcc7f1d
commit 4f44362
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 2 deletions.
diff --git a/admin/_twistedpython3.py b/admin/_twistedpython3.py
@@ -25,12 +25,15 @@
     "twisted.internet.default",
     "twisted.internet.defer",
     "twisted.internet._endpointspy3",
+    "twisted.internet.epollreactor",
     "twisted.internet.error",
     "twisted.internet.interfaces",
     "twisted.internet.fdesc",
     "twisted.internet.main",
     "twisted.internet.protocol",
-    "twisted.internet.reactor", # don't expect it to work yet, though!
+    "twisted.internet.pollreactor",
+    "twisted.internet.reactor",
+    "twisted.internet.selectreactor",
     "twisted.internet._signals",
     "twisted.internet.task",
     "twisted.internet.tcp",
@@ -115,6 +118,7 @@
     "twisted.internet.test.test_core",
     "twisted.internet.test.test_default",
     "twisted.internet.test.test_endpointspy3",
+    "twisted.internet.test.test_epollreactor",
     "twisted.internet.test.test_fdset",
     "twisted.internet.test.test_filedescriptor",
     "twisted.internet.test.test_inlinecb",

diff --git a/twisted/internet/epollreactor.py b/twisted/internet/epollreactor.py
@@ -11,6 +11,8 @@
     epollreactor.install()
 """
 
+from __future__ import division, absolute_import
+
 import errno
 
 from zope.interface import implementer

diff --git a/twisted/internet/pollreactor.py b/twisted/internet/pollreactor.py
@@ -11,6 +11,8 @@
     pollreactor.install()
 """
 
+from __future__ import division, absolute_import
+
 # System imports
 import errno
 from select import error as SelectError, poll

diff --git a/twisted/internet/selectreactor.py b/twisted/internet/selectreactor.py
@@ -2,11 +2,12 @@
 # Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
-
 """
 Select reactor
 """
 
+from __future__ import division, absolute_import
+
 from time import sleep
 import sys, select, socket
 from errno import EINTR, EBADF

diff --git a/twisted/internet/test/test_epollreactor.py b/twisted/internet/test/test_epollreactor.py
@@ -5,6 +5,8 @@
 Tests for L{twisted.internet.epollreactor}.
 """
 
+from __future__ import division, absolute_import
+
 from twisted.trial.unittest import TestCase
 try:
     from twisted.internet.epollreactor import _ContinuousPolling

diff --git a/twisted/topfiles/6068.misc b/twisted/topfiles/6068.misc