Move win32_support to a new tornado.platform package

diff --git a/tornado/httpserver.py b/tornado/httpserver.py
index 0e8bad9a21b898d52c9d8137a638ff0d5a916f48..eddb751228a949cec2d5096f7453c653394e1129 100644 (file)
--- a/tornado/httpserver.py
+++ b/tornado/httpserver.py
@@ -40,14 +40,6 @@ from tornado import process
 from tornado import stack_context
 from tornado.util import b, bytes_type
 
-try:
-    import fcntl
-except ImportError:
-    if os.name == 'nt':
-        from tornado import win32_support as fcntl
-    else:
-        raise
-
 try:
     import ssl # Python 2.6+
 except ImportError:

diff --git a/tornado/ioloop.py b/tornado/ioloop.py
index 78c41d75e329eeadbc70ffde684b40bd0c387e74..c8396fd4eb0ce23a6d0656990a9b9dd55aae4d39 100644 (file)
--- a/tornado/ioloop.py
+++ b/tornado/ioloop.py
@@ -47,8 +47,8 @@ try:
     import fcntl
 except ImportError:
     if os.name == 'nt':
-        from tornado import win32_support
-        from tornado import win32_support as fcntl
+        from tornado.platform import windows
+        from tornado.platform import windows as fcntl
     else:
         raise
 
@@ -131,7 +131,7 @@ class IOLoop(object):
             self._waker_reader = os.fdopen(r, "rb", 0)
             self._waker_writer = os.fdopen(w, "wb", 0)
         else:
-            self._waker_reader = self._waker_writer = win32_support.Pipe()
+            self._waker_reader = self._waker_writer = windows.Pipe()
             r = self._waker_writer.reader_fd
         self.add_handler(r, self._read_waker, self.READ)
 

diff --git a/tornado/netutil.py b/tornado/netutil.py
index dad17cea66f06119f98b69f33e0a8352d58d8be7..2b177ad1eafd0fa50eb268c6bdc9ebaf753bdb17 100644 (file)
--- a/tornado/netutil.py
+++ b/tornado/netutil.py
@@ -23,7 +23,7 @@ try:
     import fcntl
 except ImportError:
     if os.name == 'nt':
-        from tornado import win32_support as fcntl
+        from tornado.platform import windows as fcntl
     else:
         raise
 

diff --git a/tornado/platform/__init__.py b/tornado/platform/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tornado/win32_support.py b/tornado/platform/windows.py
similarity index 100%
rename from tornado/win32_support.py
rename to tornado/platform/windows.py

diff --git a/tornado/test/import_test.py b/tornado/test/import_test.py
index 7d300c525d19f55185e05eec0598d7e27afc0057..2275a1165815a887418be70426b135971483525b 100644 (file)
--- a/tornado/test/import_test.py
+++ b/tornado/test/import_test.py
@@ -26,5 +26,4 @@ class ImportTest(unittest.TestCase):
         import tornado.util
         import tornado.web
         import tornado.websocket
-        # import tornado.win32_support  # depends on windows
         import tornado.wsgi