summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_urllib2.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-11-21 13:34:58 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-11-21 13:34:58 (GMT)
commit2623a37852153363335956afab010cb0beb7e74e (patch)
treee443a19bb7a87adc2158ef2e32da5c2f3b21936c /Lib/test/test_urllib2.py
parent40a92f5c65767d80ebc3b3be2c2ccfc5db3afb7b (diff)
downloadcpython-2623a37852153363335956afab010cb0beb7e74e.zip
cpython-2623a37852153363335956afab010cb0beb7e74e.tar.gz
cpython-2623a37852153363335956afab010cb0beb7e74e.tar.bz2
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. ........
Diffstat (limited to 'Lib/test/test_urllib2.py')
-rw-r--r--Lib/test/test_urllib2.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index 983ffa8..46db6b4 100644
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -45,7 +45,7 @@ class TrivialTests(unittest.TestCase):
('a, b, "c", "d", "e,f", g, h', ['a', 'b', '"c"', '"d"', '"e,f"', 'g', 'h']),
('a="b\\"c", d="e\\,f", g="h\\\\i"', ['a="b"c"', 'd="e,f"', 'g="h\\i"'])]
for string, list in tests:
- self.assertEquals(urllib2.parse_http_list(string), list)
+ self.assertEqual(urllib2.parse_http_list(string), list)
def test_request_headers_dict():
@@ -872,7 +872,7 @@ class HandlerTests(unittest.TestCase):
r = MockResponse(200, "OK", {}, "")
newreq = h.http_request(req)
self.assertTrue(cj.ach_req is req is newreq)
- self.assertEquals(req.get_origin_req_host(), "example.com")
+ self.assertEqual(req.get_origin_req_host(), "example.com")
self.assertTrue(not req.is_unverifiable())
newr = h.http_response(req, r)
self.assertTrue(cj.ec_req is req)