--- Modules/socketmodule.c.orig	2009-09-18 21:33:46.956897764 +0200
+++ Modules/socketmodule.c	2009-09-18 21:59:34.612903576 +0200
@@ -3890,6 +3890,10 @@
 	flags = flowinfo = scope_id = 0;
 	if (!PyArg_ParseTuple(args, "Oi:getnameinfo", &sa, &flags))
 		return NULL;
+	if (!PyTuple_Check(sa)) {
+		PyErr_SetString(PyExc_TypeError, "address must be a tuple");
+		return NULL;
+	}
 	if  (!PyArg_ParseTuple(sa, "si|ii",
 			       &hostp, &port, &flowinfo, &scope_id))
 		return NULL;
@@ -3912,17 +3916,6 @@
 		goto fail;
 	}
 	switch (res->ai_family) {
-	case AF_INET:
-	    {
-		char *t1;
-		int t2;
-		if (PyArg_ParseTuple(sa, "si", &t1, &t2) == 0) {
-			PyErr_SetString(socket_error,
-				"IPv4 sockaddr must be 2 tuple");
-			goto fail;
-		}
-		break;
-	    }
 #ifdef ENABLE_IPV6
 	case AF_INET6:
 	    {