Merged revisions 79165 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79165 | florent.xicluna | 2010-03-21 03:14:24 +0200 (Sun, 21 Mar 2010) | 2 lines
#7092 - Silence more py3k deprecation warnings, using test_support.check_py3k_warnings() helper.
........
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 4a0b600..f52d884 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -123,8 +123,9 @@
self.server_ready.wait()
self.client_ready.set()
self.clientSetUp()
- if not callable(test_func):
- raise TypeError, "test_func must be a callable function"
+ with test_support._check_py3k_warnings():
+ if not callable(test_func):
+ raise TypeError("test_func must be a callable function.")
try:
test_func()
except Exception, strerror:
@@ -132,7 +133,7 @@
self.clientTearDown()
def clientSetUp(self):
- raise NotImplementedError, "clientSetUp must be implemented."
+ raise NotImplementedError("clientSetUp must be implemented.")
def clientTearDown(self):
self.done.set()
@@ -282,8 +283,8 @@
orig = sys.getrefcount(__name__)
socket.getnameinfo(__name__,0)
except TypeError:
- if sys.getrefcount(__name__) <> orig:
- self.fail("socket.getnameinfo loses a reference")
+ self.assertEqual(sys.getrefcount(__name__), orig,
+ "socket.getnameinfo loses a reference")
def testInterpreterCrash(self):
# Making sure getnameinfo doesn't crash the interpreter
@@ -1198,7 +1199,8 @@
self.assertEqual(msg, MSG)
def _testRecvInto(self):
- buf = buffer(MSG)
+ with test_support._check_py3k_warnings():
+ buf = buffer(MSG)
self.serv_conn.send(buf)
def testRecvFromInto(self):
@@ -1209,7 +1211,8 @@
self.assertEqual(msg, MSG)
def _testRecvFromInto(self):
- buf = buffer(MSG)
+ with test_support._check_py3k_warnings():
+ buf = buffer(MSG)
self.serv_conn.send(buf)