Record that FCNTL.py has gone away; remove FCNTL hack in tempfile.py;

another hack remains in test___all__.py, but the problem that one
addresses is more general than *just* FCNTL, so leaving it alone.

1 files changed, 5 insertions, 7 deletions

diff --git a/Lib/tempfile.py b/Lib/tempfile.py
index ef6a1c5..ae2ed9e 100644
--- a/Lib/tempfile.py
+++ b/Lib/tempfile.py
@@ -38,17 +38,15 @@ if _os.name == 'mac':
 
 try:
     import fcntl as _fcntl
-    # If PYTHONCASEOK is set on Windows, stinking FCNTL.py gets
-    # imported, and we don't get an ImportError then.  Provoke
-    # an AttributeError instead in that case.
-    _fcntl.fcntl
-except (ImportError, AttributeError):
+except ImportError:
     def _set_cloexec(fd):
         pass
 else:
     def _set_cloexec(fd):
-        try: flags = _fcntl.fcntl(fd, _fcntl.F_GETFD, 0)
-        except IOError: pass
+        try:
+            flags = _fcntl.fcntl(fd, _fcntl.F_GETFD, 0)
+        except IOError:
+            pass
         else:
             # flags read successfully, modify
             flags |= _fcntl.FD_CLOEXEC