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_httplib.py b/Lib/test/test_httplib.py
index d7b73e1..bb6d3cf 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -135,7 +135,7 @@
def test_bad_status_repr(self):
exc = httplib.BadStatusLine('')
- self.assertEquals(repr(exc), '''BadStatusLine("\'\'",)''')
+ self.assertEqual(repr(exc), '''BadStatusLine("\'\'",)''')
def test_partial_reads(self):
# if we have a lenght, the system knows when to close itself
@@ -216,13 +216,13 @@
sock = FakeSocket(None)
conn.sock = sock
conn.send(expected)
- self.assertEquals(expected, sock.data)
+ self.assertEqual(expected, sock.data)
sock.data = ''
conn.send(array.array('c', expected))
- self.assertEquals(expected, sock.data)
+ self.assertEqual(expected, sock.data)
sock.data = ''
conn.send(StringIO.StringIO(expected))
- self.assertEquals(expected, sock.data)
+ self.assertEqual(expected, sock.data)
def test_chunked(self):
chunked_start = (
@@ -236,7 +236,7 @@
sock = FakeSocket(chunked_start + '0\r\n')
resp = httplib.HTTPResponse(sock, method="GET")
resp.begin()
- self.assertEquals(resp.read(), 'hello world')
+ self.assertEqual(resp.read(), 'hello world')
resp.close()
for x in ('', 'foo\r\n'):
@@ -246,7 +246,7 @@
try:
resp.read()
except httplib.IncompleteRead, i:
- self.assertEquals(i.partial, 'hello world')
+ self.assertEqual(i.partial, 'hello world')
self.assertEqual(repr(i),'IncompleteRead(11 bytes read)')
self.assertEqual(str(i),'IncompleteRead(11 bytes read)')
else:
@@ -266,9 +266,9 @@
sock = FakeSocket(chunked_start + '0\r\n')
resp = httplib.HTTPResponse(sock, method="HEAD")
resp.begin()
- self.assertEquals(resp.read(), '')
- self.assertEquals(resp.status, 200)
- self.assertEquals(resp.reason, 'OK')
+ self.assertEqual(resp.read(), '')
+ self.assertEqual(resp.status, 200)
+ self.assertEqual(resp.reason, 'OK')
self.assertTrue(resp.isclosed())
def test_negative_content_length(self):
@@ -276,7 +276,7 @@
'Content-Length: -1\r\n\r\nHello\r\n')
resp = httplib.HTTPResponse(sock, method="GET")
resp.begin()
- self.assertEquals(resp.read(), 'Hello\r\n')
+ self.assertEqual(resp.read(), 'Hello\r\n')
resp.close()
def test_incomplete_read(self):
@@ -286,7 +286,7 @@
try:
resp.read()
except httplib.IncompleteRead as i:
- self.assertEquals(i.partial, 'Hello\r\n')
+ self.assertEqual(i.partial, 'Hello\r\n')
self.assertEqual(repr(i),
"IncompleteRead(7 bytes read, 3 more expected)")
self.assertEqual(str(i),
@@ -321,7 +321,7 @@
class OfflineTest(TestCase):
def test_responses(self):
- self.assertEquals(httplib.responses[httplib.NOT_FOUND], "Not Found")
+ self.assertEqual(httplib.responses[httplib.NOT_FOUND], "Not Found")
class SourceAddressTest(TestCase):