Fix one more unchecked use of the FCNTL module.

b967fd08 · Fred Drake · ce2e1ee9 · b967fd08 · b967fd08
Commit b967fd08 authored Feb 26, 2002 by Fred Drake
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 4 deletions

ZServer/__init__.py ZServer/__init__.py +6 -2

lib/python/ZServer/__init__.py lib/python/ZServer/__init__.py +6 -2

No files found.
--- a/ZServer/__init__.py
+++ b/ZServer/__init__.py
@@ -66,9 +66,13 @@ except:
 # processes from Zope code. Thanks to Dieter Maurer for this.
 try:
    import fcntl, FCNTL
-    FCNTL.F_SETFD; FCNTL.FD_CLOEXEC
+    if not (hasattr(fcntl, 'F_SETFD') and hasattr(fcntl, 'FD_CLOEXEC')):
+        # hack to be compatible with Python versions pre-2.2
+        import FCNTL
+        fcntl.F_SETFD = FCNTL.F_SETFD
+        fcntl.FD_CLOEXEC = FCNTL.FD_CLOEXEC
    def requestCloseOnExec(sock):
-        try:    fcntl.fcntl(sock.fileno(), FCNTL.F_SETFD, FCNTL.FD_CLOEXEC)
+        try:    fcntl.fcntl(sock.fileno(), fcntl.F_SETFD, fcntl.FD_CLOEXEC)
        except: pass

 except (ImportError, AttributeError):

--- a/lib/python/ZServer/__init__.py
+++ b/lib/python/ZServer/__init__.py
@@ -66,9 +66,13 @@ except:
 # processes from Zope code. Thanks to Dieter Maurer for this.
 try:
    import fcntl, FCNTL
-    FCNTL.F_SETFD; FCNTL.FD_CLOEXEC
+    if not (hasattr(fcntl, 'F_SETFD') and hasattr(fcntl, 'FD_CLOEXEC')):
+        # hack to be compatible with Python versions pre-2.2
+        import FCNTL
+        fcntl.F_SETFD = FCNTL.F_SETFD
+        fcntl.FD_CLOEXEC = FCNTL.FD_CLOEXEC
    def requestCloseOnExec(sock):
-        try:    fcntl.fcntl(sock.fileno(), FCNTL.F_SETFD, FCNTL.FD_CLOEXEC)
+        try:    fcntl.fcntl(sock.fileno(), fcntl.F_SETFD, fcntl.FD_CLOEXEC)
        except: pass

 except (ImportError, AttributeError):