Stop using deprecated "unittest.makeSuite".

Author: fancycode

tests/test_7zfiles.py

@@ -48,7 +48,7 @@ def sorted(l):
 if sys.version_info[:2] < (3, 0):
     def bytes(s, encoding):
         return s
-    
+
     def unicode_string(s):
         return s.decode('latin-1')
 else:
@@ -122,7 +122,7 @@ def _test_umlaut_archive(self, filename):
         self.assertEqual(cf.read(), bytes('This file contains a german umlaut in the filename.', 'ascii'))
         cf.reset()
         self.assertEqual(cf.read(), bytes('This file contains a german umlaut in the filename.', 'ascii'))
-        
+
     def test_non_solid_umlaut(self):
         # test loading of a non-solid archive containing files with umlauts
         self._test_umlaut_archive('umlaut-non_solid.7z')
@@ -350,7 +350,7 @@ def suite():
     ]
 
     for tc in test_cases:
-        suite.addTest(unittest.makeSuite(tc))
+        suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(tc))
 
     return suite
 

tests/test_compatibility.py

@@ -51,12 +51,12 @@ def generate_random(size, choice=random.choice, ALL_CHARS=ALL_CHARS):
     return s
 
 class TestPyLZMACompability(unittest.TestCase):
-    
+
     def setUp(self):
         self.plain = bytes('hello, this is a test string', 'ascii')
         self.plain_with_eos = unhexlify('5d0000800000341949ee8def8c6b64909b1386e370bebeb1b656f5736d653c127731a214ff7031c000')
         self.plain_without_eos = unhexlify('5d0000800000341949ee8def8c6b64909b1386e370bebeb1b656f5736d653c115edbe9')
-        
+
     def test_decompression_noeos(self):
         # test decompression without the end of stream marker
         decompressed = pylzma.decompress_compat(self.plain_without_eos)
@@ -83,7 +83,7 @@ def suite():
     ]
 
     for tc in test_cases:
-        suite.addTest(unittest.makeSuite(tc))
+        suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(tc))
 
     return suite
 

tests/test_pylzma.py

@@ -51,7 +51,7 @@ def generate_random(size, choice=random.choice, ALL_CHARS=ALL_CHARS):
     return s
 
 class TestPyLZMA(unittest.TestCase):
-    
+
     def setUp(self):
         self.plain = bytes('hello, this is a test string', 'ascii')
         self.plain_with_eos = unhexlify('5d0000800000341949ee8def8c6b64909b1386e370bebeb1b656f5736d653c127731a214ff7031c000')
@@ -64,17 +64,17 @@ def test_compression_eos(self):
         # test compression with end of stream marker
         compressed = pylzma.compress(self.plain, eos=1)
         self.assertEqual(compressed, self.plain_with_eos)
-    
+
     def test_compression_no_eos(self):
         # test compression without end of stream marker
         compressed = pylzma.compress(self.plain, eos=0)
         self.assertEqual(compressed, self.plain_without_eos)
-        
+
     def test_decompression_eos(self):
         # test decompression with the end of stream marker
         decompressed = pylzma.decompress(self.plain_with_eos)
         self.assertEqual(decompressed, self.plain)
-        
+
     def test_decompression_noeos(self):
         # test decompression without the end of stream marker
         decompressed = pylzma.decompress(self.plain_without_eos, maxlength=28)
@@ -109,7 +109,7 @@ def test_decompression_stream(self):
         data = decompress.decompress(self.plain_with_eos)
         data += decompress.flush()
         self.assertEqual(data, self.plain)
-    
+
     def test_decompression_stream_two(self):
         # test decompression in two steps
         decompress = pylzma.decompressobj()
@@ -187,7 +187,7 @@ def test_compression_file(self):
         self.assertEqual(check, self.plain)
 
     if sys.version_info[:2] < (3, 0):
-        
+
         def test_compression_file_python(self):
             # test compressing from file-like object (Python class)
             from StringIO import StringIO as PyStringIO
@@ -265,7 +265,7 @@ def suite():
     ]
 
     for tc in test_cases:
-        suite.addTest(unittest.makeSuite(tc))
+        suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(tc))
 
     return suite