[Python-checkins] cpython (merge 3.6 -> default): Issue #28815: Merge test tweak from 3.6

[martin.panter]

https://hg.python.org/cpython/rev/82fb37281954
changeset:   106037:82fb37281954
parent:      106034:111b3efd5d8e
parent:      106036:401e70317976
user:        Martin Panter <vadmium+py at gmail.com>
date:        Sun Jan 08 01:06:48 2017 +0000
summary:
  Issue #28815: Merge test tweak from 3.6

files:
  Lib/test/test_socket.py |  10 +++-------
  1 files changed, 3 insertions(+), 7 deletions(-)


diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -4798,14 +4798,10 @@
         return False
     try:
         f = open("/proc/modules")
-    except IOError as e:
+    except (FileNotFoundError, IsADirectoryError, PermissionError):
         # It's ok if the file does not exist, is a directory or if we
-        # have not the permission to read it. In any other case it's a
-        # real error, so raise it again.
-        if e.errno in (errno.ENOENT, errno.EISDIR, errno.EACCES):
-            return False
-        else:
-            raise
+        # have not the permission to read it.
+        return False
     with f:
         for line in f:
             if line.startswith("tipc "):

-- 
Repository URL: https://hg.python.org/cpython