Merged revisions 86596 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line
#9424: Replace deprecated assert* methods in the Python test suite.
........
diff --git a/Lib/test/test_popen2.py b/Lib/test/test_popen2.py
index 715858e..ea41075 100644
--- a/Lib/test/test_popen2.py
+++ b/Lib/test/test_popen2.py
@@ -63,8 +63,8 @@
w.write(teststr)
w.close()
got = r.read()
- self.assertEquals(expected_out, got.strip(), "wrote %r read %r" %
- (teststr, got))
+ self.assertEqual(expected_out, got.strip(), "wrote %r read %r" %
+ (teststr, got))
if e is not None:
got = e.read()
@@ -90,7 +90,7 @@
w, r = os.popen2(["echo", self.teststr])
got = r.read()
- self.assertEquals(got, self.teststr + "\n")
+ self.assertEqual(got, self.teststr + "\n")
w, r = os.popen2(self.cmd)
self.validate_output(self.teststr, self.expected, r, w)
@@ -103,7 +103,7 @@
w, r, e = os.popen3(["echo", self.teststr])
got = r.read()
- self.assertEquals(got, self.teststr + "\n")
+ self.assertEqual(got, self.teststr + "\n")
got = e.read()
self.assertFalse(got, "unexpected %r on stderr" % got)
@@ -117,7 +117,7 @@
w, r = os.popen4(["echo", self.teststr])
got = r.read()
- self.assertEquals(got, self.teststr + "\n")
+ self.assertEqual(got, self.teststr + "\n")
w, r = os.popen4(self.cmd)
self.validate_output(self.teststr, self.expected, r, w)