Skip to content

Commit a11865b

Browse files
ezio-melottiezio-melotti
committed
Merged revisions 78249 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r78249 | ezio.melotti | 2010-02-20 11:40:07 +0200 (Sat, 20 Feb 2010) | 1 line Remove e assertIs definitions and use correct assert* methods. ........
1 parent ef7d672 commit a11865b

6 files changed

Lines changed: 25 additions & 42 deletions

File tree

‎Lib/test/test_bool.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@
77

88
class BoolTest(unittest.TestCase):
99

10-
def assertIs(self, a, b):
11-
self.assertTrue(a is b)
12-
13-
def assertIsNot(self, a, b):
14-
self.assertTrue(a is not b)
15-
1610
def test_subclass(self):
1711
try:
1812
class C(bool):

‎Lib/test/test_complex.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ def assertClose(self, x, y, eps=1e-9):
6565
self.assertCloseAbs(x.real, y.real, eps)
6666
self.assertCloseAbs(x.imag, y.imag, eps)
6767

68-
def assertIs(self, a, b):
69-
self.assertTrue(a is b)
70-
7168
def check_div(self, x, y):
7269
"""Compute complex z=x*y, and check that z/x==y and z/y==x."""
7370
z = x * y

‎Lib/test/test_genericpath.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55

66
class AllCommonTest(unittest.TestCase):
77

8-
def assertIs(self, a, b):
9-
self.assertTrue(a is b)
10-
118
def test_commonprefix(self):
129
self.assertEqual(
1310
genericpath.commonprefix([]),
@@ -50,8 +47,8 @@ def test_time(self):
5047
f.close()
5148
self.assertEqual(d, b"foobar")
5249

53-
self.assertTrue(
54-
genericpath.getctime(support.TESTFN) <=
50+
self.assertLessEqual(
51+
genericpath.getctime(support.TESTFN),
5552
genericpath.getmtime(support.TESTFN)
5653
)
5754
finally:

‎Lib/test/test_macpath.py‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ def test_isabs(self):
2929

3030
def test_commonprefix(self):
3131
commonprefix = macpath.commonprefix
32-
self.assertTrue(commonprefix(["home:swenson:spam", "home:swen:spam"])
33-
== "home:swen")
34-
self.assertTrue(commonprefix([":home:swen:spam", ":home:swen:eggs"])
35-
== ":home:swen:")
36-
self.assertTrue(commonprefix([":home:swen:spam", ":home:swen:spam"])
37-
== ":home:swen:spam")
32+
self.assertEqual(commonprefix(["home:swenson:spam", "home:swen:spam"]),
33+
"home:swen")
34+
self.assertEqual(commonprefix([":home:swen:spam", ":home:swen:eggs"]),
35+
":home:swen:")
36+
self.assertEqual(commonprefix([":home:swen:spam", ":home:swen:spam"]),
37+
":home:swen:spam")
3838

3939
self.assertTrue(commonprefix([b"home:swenson:spam", b"home:swen:spam"])
4040
== b"home:swen")
@@ -45,13 +45,13 @@ def test_commonprefix(self):
4545

4646
def test_split(self):
4747
split = macpath.split
48-
self.assertEquals(split("foo:bar"),
48+
self.assertEqual(split("foo:bar"),
4949
('foo:', 'bar'))
50-
self.assertEquals(split("conky:mountpoint:foo:bar"),
50+
self.assertEqual(split("conky:mountpoint:foo:bar"),
5151
('conky:mountpoint:foo', 'bar'))
5252

53-
self.assertEquals(split(":"), ('', ''))
54-
self.assertEquals(split(":conky:mountpoint:"),
53+
self.assertEqual(split(":"), ('', ''))
54+
self.assertEqual(split(":conky:mountpoint:"),
5555
(':conky:mountpoint', ''))
5656

5757
self.assertEquals(split(b"foo:bar"),
@@ -79,21 +79,21 @@ def test_join(self):
7979

8080
def test_splitdrive(self):
8181
splitdrive = macpath.splitdrive
82-
self.assertEquals(splitdrive("foo:bar"), ('', 'foo:bar'))
83-
self.assertEquals(splitdrive(":foo:bar"), ('', ':foo:bar'))
82+
self.assertEqual(splitdrive("foo:bar"), ('', 'foo:bar'))
83+
self.assertEqual(splitdrive(":foo:bar"), ('', ':foo:bar'))
8484

8585
self.assertEquals(splitdrive(b"foo:bar"), (b'', b'foo:bar'))
8686
self.assertEquals(splitdrive(b":foo:bar"), (b'', b':foo:bar'))
8787

8888
def test_splitext(self):
8989
splitext = macpath.splitext
90-
self.assertEquals(splitext(":foo.ext"), (':foo', '.ext'))
91-
self.assertEquals(splitext("foo:foo.ext"), ('foo:foo', '.ext'))
92-
self.assertEquals(splitext(".ext"), ('.ext', ''))
93-
self.assertEquals(splitext("foo.ext:foo"), ('foo.ext:foo', ''))
94-
self.assertEquals(splitext(":foo.ext:"), (':foo.ext:', ''))
95-
self.assertEquals(splitext(""), ('', ''))
96-
self.assertEquals(splitext("foo.bar.ext"), ('foo.bar', '.ext'))
90+
self.assertEqual(splitext(":foo.ext"), (':foo', '.ext'))
91+
self.assertEqual(splitext("foo:foo.ext"), ('foo:foo', '.ext'))
92+
self.assertEqual(splitext(".ext"), ('.ext', ''))
93+
self.assertEqual(splitext("foo.ext:foo"), ('foo.ext:foo', ''))
94+
self.assertEqual(splitext(":foo.ext:"), (':foo.ext:', ''))
95+
self.assertEqual(splitext(""), ('', ''))
96+
self.assertEqual(splitext("foo.bar.ext"), ('foo.bar', '.ext'))
9797

9898
self.assertEquals(splitext(b":foo.ext"), (b':foo', b'.ext'))
9999
self.assertEquals(splitext(b"foo:foo.ext"), (b'foo:foo', b'.ext'))

‎Lib/test/test_posixpath.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ def tearDown(self):
2525
support.unlink(support.TESTFN + suffix)
2626
safe_rmdir(support.TESTFN + suffix)
2727

28-
def assertIs(self, a, b):
29-
self.assertTrue(a is b)
30-
3128
def test_normcase(self):
3229
# Check that normcase() is idempotent
3330
p = "FoO/./BaR"
@@ -229,8 +226,8 @@ def test_time(self):
229226
f.close()
230227
self.assertEqual(d, b"foobar")
231228

232-
self.assertTrue(
233-
posixpath.getctime(support.TESTFN) <=
229+
self.assertLessEqual(
230+
posixpath.getctime(support.TESTFN),
234231
posixpath.getmtime(support.TESTFN)
235232
)
236233
finally:
@@ -560,7 +557,8 @@ def test_realpath_resolve_before_normalizing(self):
560557
self.assertEqual(realpath(ABSTFN + "/link-y/.."), ABSTFN + "/k")
561558
# Relative path.
562559
os.chdir(dirname(ABSTFN))
563-
self.assertEqual(realpath(basename(ABSTFN) + "/link-y/.."), ABSTFN + "/k")
560+
self.assertEqual(realpath(basename(ABSTFN) + "/link-y/.."),
561+
ABSTFN + "/k")
564562
finally:
565563
os.chdir(old_path)
566564
support.unlink(ABSTFN + "/link-y")

‎Lib/test/test_richcmp.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,6 @@ def test_dicts(self):
279279

280280
class ListTest(unittest.TestCase):
281281

282-
def assertIs(self, a, b):
283-
self.assertTrue(a is b)
284-
285282
def test_coverage(self):
286283
# exercise all comparisons for lists
287284
x = [42]

0 commit comments

Comments
 (0)