Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b3aedd4

Browse files
ezio-melottiezio-melotti
committed
#9424: Replace deprecated assert* methods in the Python test suite.
1 parent b8bc439 commit b3aedd4

170 files changed

Lines changed: 2392 additions & 2396 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Lib/ctypes/test/test_keeprefs.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
class SimpleTestCase(unittest.TestCase):
55
def test_cint(self):
66
x = c_int()
7-
self.assertEquals(x._objects, None)
7+
self.assertEqual(x._objects, None)
88
x.value = 42
9-
self.assertEquals(x._objects, None)
9+
self.assertEqual(x._objects, None)
1010
x = c_int(99)
11-
self.assertEquals(x._objects, None)
11+
self.assertEqual(x._objects, None)
1212

1313
def test_ccharp(self):
1414
x = c_char_p()
15-
self.assertEquals(x._objects, None)
15+
self.assertEqual(x._objects, None)
1616
x.value = b"abc"
17-
self.assertEquals(x._objects, b"abc")
17+
self.assertEqual(x._objects, b"abc")
1818
x = c_char_p(b"spam")
19-
self.assertEquals(x._objects, b"spam")
19+
self.assertEqual(x._objects, b"spam")
2020

2121
class StructureTestCase(unittest.TestCase):
2222
def test_cint_struct(self):
@@ -25,21 +25,21 @@ class X(Structure):
2525
("b", c_int)]
2626

2727
x = X()
28-
self.assertEquals(x._objects, None)
28+
self.assertEqual(x._objects, None)
2929
x.a = 42
3030
x.b = 99
31-
self.assertEquals(x._objects, None)
31+
self.assertEqual(x._objects, None)
3232

3333
def test_ccharp_struct(self):
3434
class X(Structure):
3535
_fields_ = [("a", c_char_p),
3636
("b", c_char_p)]
3737
x = X()
38-
self.assertEquals(x._objects, None)
38+
self.assertEqual(x._objects, None)
3939

4040
x.a = b"spam"
4141
x.b = b"foo"
42-
self.assertEquals(x._objects, {"0": b"spam", "1": b"foo"})
42+
self.assertEqual(x._objects, {"0": b"spam", "1": b"foo"})
4343

4444
def test_struct_struct(self):
4545
class POINT(Structure):
@@ -52,28 +52,28 @@ class RECT(Structure):
5252
r.ul.y = 1
5353
r.lr.x = 2
5454
r.lr.y = 3
55-
self.assertEquals(r._objects, None)
55+
self.assertEqual(r._objects, None)
5656

5757
r = RECT()
5858
pt = POINT(1, 2)
5959
r.ul = pt
60-
self.assertEquals(r._objects, {'0': {}})
60+
self.assertEqual(r._objects, {'0': {}})
6161
r.ul.x = 22
6262
r.ul.y = 44
63-
self.assertEquals(r._objects, {'0': {}})
63+
self.assertEqual(r._objects, {'0': {}})
6464
r.lr = POINT()
65-
self.assertEquals(r._objects, {'0': {}, '1': {}})
65+
self.assertEqual(r._objects, {'0': {}, '1': {}})
6666

6767
class ArrayTestCase(unittest.TestCase):
6868
def test_cint_array(self):
6969
INTARR = c_int * 3
7070

7171
ia = INTARR()
72-
self.assertEquals(ia._objects, None)
72+
self.assertEqual(ia._objects, None)
7373
ia[0] = 1
7474
ia[1] = 2
7575
ia[2] = 3
76-
self.assertEquals(ia._objects, None)
76+
self.assertEqual(ia._objects, None)
7777

7878
class X(Structure):
7979
_fields_ = [("x", c_int),
@@ -83,9 +83,9 @@ class X(Structure):
8383
x.x = 1000
8484
x.a[0] = 42
8585
x.a[1] = 96
86-
self.assertEquals(x._objects, None)
86+
self.assertEqual(x._objects, None)
8787
x.a = ia
88-
self.assertEquals(x._objects, {'1': {}})
88+
self.assertEqual(x._objects, {'1': {}})
8989

9090
class PointerTestCase(unittest.TestCase):
9191
def test_p_cint(self):

‎Lib/distutils/tests/test_archive_util.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def test_tarfile_vs_tar(self):
113113

114114
self.assertTrue(os.path.exists(tarball2))
115115
# let's compare both tarballs
116-
self.assertEquals(self._tarinfo(tarball), self._tarinfo(tarball2))
116+
self.assertEqual(self._tarinfo(tarball), self._tarinfo(tarball2))
117117

118118
# trying an uncompressed one
119119
base_name = os.path.join(tmpdir2, 'archive')
@@ -153,7 +153,7 @@ def test_compress_deprecated(self):
153153
os.chdir(old_dir)
154154
tarball = base_name + '.tar.Z'
155155
self.assertTrue(os.path.exists(tarball))
156-
self.assertEquals(len(w.warnings), 1)
156+
self.assertEqual(len(w.warnings), 1)
157157

158158
# same test with dry_run
159159
os.remove(tarball)
@@ -167,7 +167,7 @@ def test_compress_deprecated(self):
167167
finally:
168168
os.chdir(old_dir)
169169
self.assertTrue(not os.path.exists(tarball))
170-
self.assertEquals(len(w.warnings), 1)
170+
self.assertEqual(len(w.warnings), 1)
171171

172172
@unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
173173
def test_make_zipfile(self):
@@ -184,9 +184,9 @@ def test_make_zipfile(self):
184184
tarball = base_name + '.zip'
185185

186186
def test_check_archive_formats(self):
187-
self.assertEquals(check_archive_formats(['gztar', 'xxx', 'zip']),
188-
'xxx')
189-
self.assertEquals(check_archive_formats(['gztar', 'zip']), None)
187+
self.assertEqual(check_archive_formats(['gztar', 'xxx', 'zip']),
188+
'xxx')
189+
self.assertEqual(check_archive_formats(['gztar', 'zip']), None)
190190

191191
def test_make_archive(self):
192192
tmpdir = self.mkdtemp()
@@ -203,7 +203,7 @@ def _breaks(*args, **kw):
203203
make_archive('xxx', 'xxx', root_dir=self.mkdtemp())
204204
except:
205205
pass
206-
self.assertEquals(os.getcwd(), current_dir)
206+
self.assertEqual(os.getcwd(), current_dir)
207207
finally:
208208
del ARCHIVE_FORMATS['xxx']
209209

‎Lib/distutils/tests/test_bdist.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def test_formats(self):
2424
cmd = bdist(dist)
2525
cmd.formats = ['msi']
2626
cmd.ensure_finalized()
27-
self.assertEquals(cmd.formats, ['msi'])
27+
self.assertEqual(cmd.formats, ['msi'])
2828

2929
# what format bdist offers ?
3030
# XXX an explicit list in bdist is
@@ -35,7 +35,7 @@ def test_formats(self):
3535
formats.sort()
3636
founded = list(cmd.format_command.keys())
3737
founded.sort()
38-
self.assertEquals(founded, formats)
38+
self.assertEqual(founded, formats)
3939

4040
def test_suite():
4141
return unittest.makeSuite(BuildTestCase)

‎Lib/distutils/tests/test_bdist_dumb.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def test_simple_built(self):
6969
base = base.replace(':', '-')
7070

7171
wanted = ['%s.zip' % base]
72-
self.assertEquals(dist_created, wanted)
72+
self.assertEqual(dist_created, wanted)
7373

7474
# now let's check what we have in the zip file
7575
# XXX to be done

‎Lib/distutils/tests/test_build.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ def test_finalize_options(self):
1818
cmd.finalize_options()
1919

2020
# if not specified, plat_name gets the current platform
21-
self.assertEquals(cmd.plat_name, get_platform())
21+
self.assertEqual(cmd.plat_name, get_platform())
2222

2323
# build_purelib is build + lib
2424
wanted = os.path.join(cmd.build_base, 'lib')
25-
self.assertEquals(cmd.build_purelib, wanted)
25+
self.assertEqual(cmd.build_purelib, wanted)
2626

2727
# build_platlib is 'build/lib.platform-x.x[-pydebug]'
2828
# examples:
@@ -32,21 +32,21 @@ def test_finalize_options(self):
3232
self.assertTrue(cmd.build_platlib.endswith('-pydebug'))
3333
plat_spec += '-pydebug'
3434
wanted = os.path.join(cmd.build_base, 'lib' + plat_spec)
35-
self.assertEquals(cmd.build_platlib, wanted)
35+
self.assertEqual(cmd.build_platlib, wanted)
3636

3737
# by default, build_lib = build_purelib
38-
self.assertEquals(cmd.build_lib, cmd.build_purelib)
38+
self.assertEqual(cmd.build_lib, cmd.build_purelib)
3939

4040
# build_temp is build/temp.<plat>
4141
wanted = os.path.join(cmd.build_base, 'temp' + plat_spec)
42-
self.assertEquals(cmd.build_temp, wanted)
42+
self.assertEqual(cmd.build_temp, wanted)
4343

4444
# build_scripts is build/scripts-x.x
4545
wanted = os.path.join(cmd.build_base, 'scripts-' + sys.version[0:3])
46-
self.assertEquals(cmd.build_scripts, wanted)
46+
self.assertEqual(cmd.build_scripts, wanted)
4747

4848
# executable is os.path.normpath(sys.executable)
49-
self.assertEquals(cmd.executable, os.path.normpath(sys.executable))
49+
self.assertEqual(cmd.executable, os.path.normpath(sys.executable))
5050

5151
def test_suite():
5252
return unittest.makeSuite(BuildTestCase)

‎Lib/distutils/tests/test_build_clib.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ def test_get_source_files(self):
5757
self.assertRaises(DistutilsSetupError, cmd.get_source_files)
5858

5959
cmd.libraries = [('name', {'sources': ['a', 'b']})]
60-
self.assertEquals(cmd.get_source_files(), ['a', 'b'])
60+
self.assertEqual(cmd.get_source_files(), ['a', 'b'])
6161

6262
cmd.libraries = [('name', {'sources': ('a', 'b')})]
63-
self.assertEquals(cmd.get_source_files(), ['a', 'b'])
63+
self.assertEqual(cmd.get_source_files(), ['a', 'b'])
6464

6565
cmd.libraries = [('name', {'sources': ('a', 'b')}),
6666
('name2', {'sources': ['c', 'd']})]
67-
self.assertEquals(cmd.get_source_files(), ['a', 'b', 'c', 'd'])
67+
self.assertEqual(cmd.get_source_files(), ['a', 'b', 'c', 'd'])
6868

6969
def test_build_libraries(self):
7070

@@ -93,11 +93,11 @@ def test_finalize_options(self):
9393

9494
cmd.include_dirs = 'one-dir'
9595
cmd.finalize_options()
96-
self.assertEquals(cmd.include_dirs, ['one-dir'])
96+
self.assertEqual(cmd.include_dirs, ['one-dir'])
9797

9898
cmd.include_dirs = None
9999
cmd.finalize_options()
100-
self.assertEquals(cmd.include_dirs, [])
100+
self.assertEqual(cmd.include_dirs, [])
101101

102102
cmd.distribution.libraries = 'WONTWORK'
103103
self.assertRaises(DistutilsSetupError, cmd.finalize_options)

0 commit comments

Comments
 (0)