mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #16793. Replace deprecated unittest asserts with modern counterparts.

Browse source
This commit is contained in:
Serhiy Storchaka 2012-12-28 00:32:19 +02:00
parent 270767b2ce
commit 8876145fab
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/ctypes/test/test_bitfields.py
View file

@ -246,9 +246,9 @@ class BitFieldTest(unittest.TestCase):
_fields_ = [("a", c_uint32, 32)] _fields_ = [("a", c_uint32, 32)]
x = X() x = X()
x.a = 10 x.a = 10
self.assertEquals(x.a, 10) self.assertEqual(x.a, 10)
x.a = 0xFDCBA987 x.a = 0xFDCBA987
self.assertEquals(x.a, 0xFDCBA987) self.assertEqual(x.a, 0xFDCBA987)
@unittest.skipUnless(hasattr(ctypes, "c_uint64"), "c_int64 is required") @unittest.skipUnless(hasattr(ctypes, "c_uint64"), "c_int64 is required")
def test_uint64(self): def test_uint64(self):
@ -256,9 +256,9 @@ class BitFieldTest(unittest.TestCase):
_fields_ = [("a", c_uint64, 64)] _fields_ = [("a", c_uint64, 64)]
x = X() x = X()
x.a = 10 x.a = 10
self.assertEquals(x.a, 10) self.assertEqual(x.a, 10)
x.a = 0xFEDCBA9876543211 x.a = 0xFEDCBA9876543211
self.assertEquals(x.a, 0xFEDCBA9876543211) self.assertEqual(x.a, 0xFEDCBA9876543211)
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()

2
Lib/test/test_calendar.py
View file

@ -261,7 +261,7 @@ class CalendarTestCase(unittest.TestCase):
return return
calendar.LocaleHTMLCalendar(locale='').formatmonthname(2010, 10) calendar.LocaleHTMLCalendar(locale='').formatmonthname(2010, 10)
new_october = calendar.TextCalendar().formatmonthname(2010, 10, 10) new_october = calendar.TextCalendar().formatmonthname(2010, 10, 10)
self.assertEquals(old_october, new_october) self.assertEqual(old_october, new_october)
def test_itermonthdates(self): def test_itermonthdates(self):
# ensure itermonthdates doesn't overflow after datetime.MAXYEAR # ensure itermonthdates doesn't overflow after datetime.MAXYEAR

10
Lib/test/test_int.py
View file

@ -347,8 +347,8 @@ class IntTestCases(IntLongCommonTests, unittest.TestCase):
for x in values: for x in values:
msg = 'x has value %s and type %s' % (x, type(x).__name__) msg = 'x has value %s and type %s' % (x, type(x).__name__)
try: try:
self.assertEquals(int(x), 100, msg=msg) self.assertEqual(int(x), 100, msg=msg)
self.assertEquals(int(x, 2), 4, msg=msg) self.assertEqual(int(x, 2), 4, msg=msg)
except TypeError, err: except TypeError, err:
raise AssertionError('For %s got TypeError: %s' % raise AssertionError('For %s got TypeError: %s' %
(type(x).__name__, err)) (type(x).__name__, err))
@ -373,10 +373,10 @@ class IntTestCases(IntLongCommonTests, unittest.TestCase):
# expects x to be a string if base is given. # expects x to be a string if base is given.
@test_support.cpython_only @test_support.cpython_only
def test_int_base_without_x_returns_0(self): def test_int_base_without_x_returns_0(self):
self.assertEquals(int(base=6), 0) self.assertEqual(int(base=6), 0)
# Even invalid bases don't raise an exception. # Even invalid bases don't raise an exception.
self.assertEquals(int(base=1), 0) self.assertEqual(int(base=1), 0)
self.assertEquals(int(base=1000), 0) self.assertEqual(int(base=1000), 0)
@test_support.cpython_only @test_support.cpython_only
def test_small_ints(self): def test_small_ints(self):

2
Lib/test/test_mutex.py
View file

@ -14,7 +14,7 @@ class MutexTest(unittest.TestCase):
m.lock(called_by_mutex2, "eggs") m.lock(called_by_mutex2, "eggs")
def called_by_mutex2(some_data): def called_by_mutex2(some_data):
self.assertEquals(some_data, "eggs") self.assertEqual(some_data, "eggs")
self.assertTrue(m.test(), "mutex not held") self.assertTrue(m.test(), "mutex not held")
self.assertTrue(ready_for_2, self.assertTrue(ready_for_2,
"called_by_mutex2 called too soon") "called_by_mutex2 called too soon")

2
Lib/test/test_tarfile.py
View file

@ -858,7 +858,7 @@ class WriteTest(WriteTestBase):
tar = tarfile.open(tmpname, "r") tar = tarfile.open(tmpname, "r")
for t in tar: for t in tar:
self.assert_(t.name == "." or t.name.startswith("./")) self.assertTrue(t.name == "." or t.name.startswith("./"))
tar.close() tar.close()
finally: finally:
os.chdir(cwd) os.chdir(cwd)