mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
Merged revisions 73715 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ........ r73715 | benjamin.peterson | 2009-07-01 01:06:06 +0200 (Mi, 01 Jul 2009) | 1 line convert old fail* assertions to assert* ........
This commit is contained in:
parent
ef82be368a
commit
ab91fdef1f
274 changed files with 4538 additions and 4538 deletions
|
@ -82,9 +82,9 @@ class CloseSocketTest(unittest.TestCase):
|
|||
|
||||
response = _urlopen_with_retry("http://www.python.org/")
|
||||
sock = response.fp
|
||||
self.assert_(not sock.closed)
|
||||
self.assertTrue(not sock.closed)
|
||||
response.close()
|
||||
self.assert_(sock.closed)
|
||||
self.assertTrue(sock.closed)
|
||||
|
||||
class OtherNetworkTests(unittest.TestCase):
|
||||
def setUp(self):
|
||||
|
@ -172,7 +172,7 @@ class OtherNetworkTests(unittest.TestCase):
|
|||
if expected_err:
|
||||
msg = ("Didn't get expected error(s) %s for %s %s, got %s: %s" %
|
||||
(expected_err, url, req, type(err), err))
|
||||
self.assert_(isinstance(err, expected_err), msg)
|
||||
self.assertTrue(isinstance(err, expected_err), msg)
|
||||
else:
|
||||
with support.time_out, \
|
||||
support.socket_peer_reset, \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue