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_socket.py b/Lib/test/test_socket.py
index a3c1d98..0cf57bd 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -425,8 +425,8 @@
return # No inet_aton, nothing to check
# Test that issue1008086 and issue767150 are fixed.
# It must return 4 bytes.
- self.assertEquals('\x00'*4, socket.inet_aton('0.0.0.0'))
- self.assertEquals('\xff'*4, socket.inet_aton('255.255.255.255'))
+ self.assertEqual('\x00'*4, socket.inet_aton('0.0.0.0'))
+ self.assertEqual('\xff'*4, socket.inet_aton('255.255.255.255'))
def testIPv4toString(self):
if not hasattr(socket, 'inet_pton'):
@@ -434,16 +434,16 @@
from socket import inet_aton as f, inet_pton, AF_INET
g = lambda a: inet_pton(AF_INET, a)
- self.assertEquals('\x00\x00\x00\x00', f('0.0.0.0'))
- self.assertEquals('\xff\x00\xff\x00', f('255.0.255.0'))
- self.assertEquals('\xaa\xaa\xaa\xaa', f('170.170.170.170'))
- self.assertEquals('\x01\x02\x03\x04', f('1.2.3.4'))
- self.assertEquals('\xff\xff\xff\xff', f('255.255.255.255'))
+ self.assertEqual('\x00\x00\x00\x00', f('0.0.0.0'))
+ self.assertEqual('\xff\x00\xff\x00', f('255.0.255.0'))
+ self.assertEqual('\xaa\xaa\xaa\xaa', f('170.170.170.170'))
+ self.assertEqual('\x01\x02\x03\x04', f('1.2.3.4'))
+ self.assertEqual('\xff\xff\xff\xff', f('255.255.255.255'))
- self.assertEquals('\x00\x00\x00\x00', g('0.0.0.0'))
- self.assertEquals('\xff\x00\xff\x00', g('255.0.255.0'))
- self.assertEquals('\xaa\xaa\xaa\xaa', g('170.170.170.170'))
- self.assertEquals('\xff\xff\xff\xff', g('255.255.255.255'))
+ self.assertEqual('\x00\x00\x00\x00', g('0.0.0.0'))
+ self.assertEqual('\xff\x00\xff\x00', g('255.0.255.0'))
+ self.assertEqual('\xaa\xaa\xaa\xaa', g('170.170.170.170'))
+ self.assertEqual('\xff\xff\xff\xff', g('255.255.255.255'))
def testIPv6toString(self):
if not hasattr(socket, 'inet_pton'):
@@ -456,10 +456,10 @@
return
f = lambda a: inet_pton(AF_INET6, a)
- self.assertEquals('\x00' * 16, f('::'))
- self.assertEquals('\x00' * 16, f('0::0'))
- self.assertEquals('\x00\x01' + '\x00' * 14, f('1::'))
- self.assertEquals(
+ self.assertEqual('\x00' * 16, f('::'))
+ self.assertEqual('\x00' * 16, f('0::0'))
+ self.assertEqual('\x00\x01' + '\x00' * 14, f('1::'))
+ self.assertEqual(
'\x45\xef\x76\xcb\x00\x1a\x56\xef\xaf\xeb\x0b\xac\x19\x24\xae\xae',
f('45ef:76cb:1a:56ef:afeb:bac:1924:aeae')
)
@@ -470,14 +470,14 @@
from socket import inet_ntoa as f, inet_ntop, AF_INET
g = lambda a: inet_ntop(AF_INET, a)
- self.assertEquals('1.0.1.0', f('\x01\x00\x01\x00'))
- self.assertEquals('170.85.170.85', f('\xaa\x55\xaa\x55'))
- self.assertEquals('255.255.255.255', f('\xff\xff\xff\xff'))
- self.assertEquals('1.2.3.4', f('\x01\x02\x03\x04'))
+ self.assertEqual('1.0.1.0', f('\x01\x00\x01\x00'))
+ self.assertEqual('170.85.170.85', f('\xaa\x55\xaa\x55'))
+ self.assertEqual('255.255.255.255', f('\xff\xff\xff\xff'))
+ self.assertEqual('1.2.3.4', f('\x01\x02\x03\x04'))
- self.assertEquals('1.0.1.0', g('\x01\x00\x01\x00'))
- self.assertEquals('170.85.170.85', g('\xaa\x55\xaa\x55'))
- self.assertEquals('255.255.255.255', g('\xff\xff\xff\xff'))
+ self.assertEqual('1.0.1.0', g('\x01\x00\x01\x00'))
+ self.assertEqual('170.85.170.85', g('\xaa\x55\xaa\x55'))
+ self.assertEqual('255.255.255.255', g('\xff\xff\xff\xff'))
def testStringToIPv6(self):
if not hasattr(socket, 'inet_ntop'):
@@ -490,9 +490,9 @@
return
f = lambda a: inet_ntop(AF_INET6, a)
- self.assertEquals('::', f('\x00' * 16))
- self.assertEquals('::1', f('\x00' * 15 + '\x01'))
- self.assertEquals(
+ self.assertEqual('::', f('\x00' * 16))
+ self.assertEqual('::1', f('\x00' * 15 + '\x01'))
+ self.assertEqual(
'aef:b01:506:1001:ffff:9997:55:170',
f('\x0a\xef\x0b\x01\x05\x06\x10\x01\xff\xff\x99\x97\x00\x55\x01\x70')
)
@@ -1016,8 +1016,8 @@
lambda : "",
])
fo = socket._fileobject(mock_sock, **kwargs)
- self.assertEquals(fo.readline(size), "This is the first line\n")
- self.assertEquals(fo.readline(size), "And the second line is here\n")
+ self.assertEqual(fo.readline(size), "This is the first line\n")
+ self.assertEqual(fo.readline(size), "And the second line is here\n")
def _test_read(self, size=-1, **kwargs):
mock_sock = self.MockSocket(recv_funcs=[
@@ -1027,7 +1027,7 @@
lambda : "",
])
fo = socket._fileobject(mock_sock, **kwargs)
- self.assertEquals(fo.read(size), "This is the first line\n"
+ self.assertEqual(fo.read(size), "This is the first line\n"
"And the second line is here\n")
def test_default(self):
@@ -1052,8 +1052,8 @@
lambda : "",
])
fo = socket._fileobject(mock_sock, bufsize=0)
- self.assertEquals(fo.readline(size), "aa\n")
- self.assertEquals(fo.readline(size), "BBbb")
+ self.assertEqual(fo.readline(size), "aa\n")
+ self.assertEqual(fo.readline(size), "BBbb")
def test_no_buffer(self):
self._test_readline_no_buffer()
@@ -1192,7 +1192,7 @@
self.addCleanup(self.cli.close)
finally:
socket.setdefaulttimeout(None)
- self.assertEquals(self.cli.gettimeout(), 42)
+ self.assertEqual(self.cli.gettimeout(), 42)
testTimeoutNone = _justAccept
def _testTimeoutNone(self):