Reverting the Revision: 77368. I committed Flox's big patch for tests by

mistake. ( It may come in for sure tough)

1 files changed, 4 insertions, 8 deletions

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index b4f37eb2a6..faa06c5a8d 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -123,7 +123,7 @@ class ThreadableTest:
         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 @@ class GeneralModuleTests(unittest.TestCase):
                 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 @@ class BufferIOTest(SocketConnectedTest):
         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 @@ class BufferIOTest(SocketConnectedTest):
         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)