Reverting the Revision: 77368. I committed Flox's big patch for tests by
mistake. ( It may come in for sure tough)
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index b4f37eb..faa06c5 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -123,7 +123,7 @@
self.server_ready.wait()
self.client_ready.set()
self.clientSetUp()
- if not hasattr(test_func, '__call__'):
+ if not callable(test_func):
raise TypeError, "test_func must be a callable function"
try:
test_func()
@@ -282,7 +282,7 @@
orig = sys.getrefcount(__name__)
socket.getnameinfo(__name__,0)
except TypeError:
- if sys.getrefcount(__name__) != orig:
+ if sys.getrefcount(__name__) <> orig:
self.fail("socket.getnameinfo loses a reference")
def testInterpreterCrash(self):
@@ -1234,9 +1234,7 @@
self.assertEqual(msg, MSG)
def _testRecvInto(self):
- # Silence Py3k warning
- with test_support.check_warnings():
- buf = buffer(MSG)
+ buf = buffer(MSG)
self.serv_conn.send(buf)
def testRecvFromInto(self):
@@ -1247,9 +1245,7 @@
self.assertEqual(msg, MSG)
def _testRecvFromInto(self):
- # Silence Py3k warning
- with test_support.check_warnings():
- buf = buffer(MSG)
+ buf = buffer(MSG)
self.serv_conn.send(buf)