From: Guido van Rossum <guido@python.org>
Date: Fri, 1 Dec 2000 13:13:11 +0000 (+0000)
Subject: Patch by Michael Hudson to clarify the error message from
X-Git-Tag: v2.1a1~679
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4dad905d440c211ca2eec90ea3ee5bdd3a0f66e;p=thirdparty%2FPython%2Fcpython.git

Patch by Michael Hudson to clarify the error message from
getsockaddrarg when the address is not a tuple.
---

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 658271342515..e9b3aadfecf8 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -605,7 +605,13 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args, struct sockaddr **addr_ret
 		char *host;
 		int port;
  		addr=(struct sockaddr_in*)&(s->sock_addr).in;
-		if (!PyArg_Parse(args, "(si)", &host, &port))
+		if (!PyTuple_Check(args)) {
+			PyErr_Format(PyExc_TypeError,
+		  "getsockaddrarg: AF_INET address must be tuple, not %.500s",
+				     args->ob_type->tp_name);
+			return 0;
+		}
+		if (!PyArg_ParseTuple(args, "si:getsockaddrarg", &host, &port))
 			return 0;
 		if (setipaddr(host, addr) < 0)
 			return 0;