Merged revisions 74943 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74943 | georg.brandl | 2009-09-19 09:35:07 +0200 (Sa, 19 Sep 2009) | 1 line
#6944: the argument to PyArg_ParseTuple should be a tuple, otherwise a SystemError is set. Also clean up another usage of PyArg_ParseTuple.
........
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 2980889..dabdcfe 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -281,7 +281,7 @@
# On some versions, this loses a reference
orig = sys.getrefcount(__name__)
socket.getnameinfo(__name__,0)
- except SystemError:
+ except TypeError:
if sys.getrefcount(__name__) <> orig:
self.fail("socket.getnameinfo loses a reference")