From a89d2dc7ad2f66dd615e1dad8559b8f2e31d436f Mon Sep 17 00:00:00 2001 From: Ben Darnell Date: Mon, 4 Jul 2011 20:20:26 -0700 Subject: [PATCH] Move win32_support to a new tornado.platform package --- tornado/httpserver.py | 8 -------- tornado/ioloop.py | 6 +++--- tornado/netutil.py | 2 +- tornado/platform/__init__.py | 0 tornado/{win32_support.py => platform/windows.py} | 0 tornado/test/import_test.py | 1 - 6 files changed, 4 insertions(+), 13 deletions(-) create mode 100644 tornado/platform/__init__.py rename tornado/{win32_support.py => platform/windows.py} (100%) diff --git a/tornado/httpserver.py b/tornado/httpserver.py index 0e8bad9a2..eddb75122 100644 --- 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 78c41d75e..c8396fd4e 100644 --- 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 dad17cea6..2b177ad1e 100644 --- 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 index 000000000..e69de29bb 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 7d300c525..2275a1165 100644 --- 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 -- 2.47.3