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/Misc/NEWS b/Misc/NEWS
index 5848fb3..8fc2f44 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -262,6 +262,9 @@
 Extension Modules
 -----------------
 
+- Issue #6944: Fix a SystemError when socket.getnameinfo() was called
+  with something other than a tuple as first argument.
+
 - Issue #6848: Fix curses module build failure on OS X 10.6.
 
 - Fix expat to not segfault with specially crafted input.