Address review: bring the types outside the assertRaises()

Author: Erlend E. Aasland

Lib/test/test_functools.py

@@ -951,7 +951,8 @@ class TestCmpToKeyC(TestCmpToKey, unittest.TestCase):
     @support.cpython_only
     def test_uninitialised_new(self):
         # Prevent heap types from being created uninitialised (bpo-43916)
-        self.assertRaises(TypeError, type(c_functools.cmp_to_key(None)))
+        tp = type(c_functools.cmp_to_key(None))
+        self.assertRaises(TypeError, tp)
 
 
 class TestCmpToKeyPy(TestCmpToKey, unittest.TestCase):

Lib/test/test_posix.py

@@ -62,7 +62,8 @@ def tearDown(self):
     def test_uninitialised_new(self):
         # Prevent heap types from being created uninitialised (bpo-43916)
         self.assertRaises(TypeError, posix.DirEntry)
-        self.assertRaises(TypeError, type(posix.scandir()))
+        tp = type(posix.scandir())
+        self.assertRaises(TypeError, tp)
 
     def testNoArgFunctions(self):
         # test posix functions which take no arguments and have

Lib/test/test_re.py

@@ -2221,8 +2221,8 @@ def test_uninitialised_new(self):
         self.assertRaises(TypeError, re.Match)
         self.assertRaises(TypeError, re.Pattern)
         pat = re.compile("")
-        scn = pat.scanner("")
-        self.assertRaises(TypeError, type(scn))
+        tp = type(pat.scanner(""))
+        self.assertRaises(TypeError, tp)
 
 
 class ExternalTests(unittest.TestCase):

Lib/test/test_threading.py

@@ -123,7 +123,8 @@ def func(): pass
     def test_uninitialised_new(self):
         # Prevent heap types from being created uninitialised (bpo-43916)
         lock = threading.Lock()
-        self.assertRaises(TypeError, type(lock))
+        tp = type(lock)
+        self.assertRaises(TypeError, tp)
 
     # Create a bunch of threads, let each do some work, wait until all are
     # done.

Lib/test/test_zlib.py

@@ -132,10 +132,10 @@ def test_overflow(self):
     @support.cpython_only
     def test_uninitialised_new(self):
         # Prevent heap types from being created uninitialised (bpo-43916)
-        comp = zlib.compressobj()
-        decomp = zlib.decompressobj()
-        self.assertRaises(TypeError, type(comp))
-        self.assertRaises(TypeError, type(decomp))
+        comp_type = type(zlib.compressobj())
+        decomp_type = type(zlib.decompressobj())
+        self.assertRaises(TypeError, comp_type)
+        self.assertRaises(TypeError, decomp_type)
 
 
 class BaseCompressTestCase(object):