[Python-checkins] bpo-29734: Cleanup test_getfinalpathname_handles test (GH-12908)

[Berker Peksag]

https://github.com/python/cpython/commit/6ef726af3ec106013c7c4261ddb306854f2b1778
commit: 6ef726af3ec106013c7c4261ddb306854f2b1778
branch: master
author: Berker Peksag <berker.peksag at gmail.com>
committer: GitHub <noreply at github.com>
date: 2019-04-22T18:46:28+03:00
summary:

bpo-29734: Cleanup test_getfinalpathname_handles test (GH-12908)

files:
M Lib/test/test_os.py

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 4c620ccae9c8..bbadb81069b9 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -2337,19 +2337,10 @@ def test_unlink_removes_junction(self):
 
 @unittest.skipUnless(sys.platform == "win32", "Win32 specific tests")
 class Win32NtTests(unittest.TestCase):
-    def setUp(self):
-        from test import support
-        self.nt = support.import_module('nt')
-        pass
-
-    def tearDown(self):
-        pass
-
     def test_getfinalpathname_handles(self):
-        try:
-            import ctypes, ctypes.wintypes
-        except ImportError:
-            raise unittest.SkipTest('ctypes module is required for this test')
+        nt = support.import_module('nt')
+        ctypes = support.import_module('ctypes')
+        import ctypes.wintypes
 
         kernel = ctypes.WinDLL('Kernel32.dll', use_last_error=True)
         kernel.GetCurrentProcess.restype = ctypes.wintypes.HANDLE
@@ -2368,21 +2359,23 @@ def test_getfinalpathname_handles(self):
         before_count = handle_count.value
 
         # The first two test the error path, __file__ tests the success path
-        filenames = [ r'\\?\C:',
-                      r'\\?\NUL',
-                      r'\\?\CONIN',
-                      __file__ ]
+        filenames = [
+            r'\\?\C:',
+            r'\\?\NUL',
+            r'\\?\CONIN',
+            __file__,
+        ]
 
-        for i in range(10):
+        for _ in range(10):
             for name in filenames:
                 try:
-                    tmp = self.nt._getfinalpathname(name)
-                except:
+                    nt._getfinalpathname(name)
+                except Exception:
                     # Failure is expected
                     pass
                 try:
-                    tmp = os.stat(name)
-                except:
+                    os.stat(name)
+                except Exception:
                     pass
 
         ok = kernel.GetProcessHandleCount(hproc, ctypes.byref(handle_count))