Patch from Michael Hudson: improve unclear error message

akuchling · akuchling · commit cb95a1470ace · 2000-06-09T14:04:53.000Z
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
@@ -393,7 +393,7 @@ PyObject *a, *el;
 		return PyUnicode_Contains(a, el);
 	if (!PyString_Check(el) || PyString_Size(el) != 1) {
 		PyErr_SetString(PyExc_TypeError,
-				"string member test needs char left operand");
+		    "'in <string>' requires character as left operand");
 		return -1;
 	}
 	c = PyString_AsString(el)[0];
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -2996,7 +2996,7 @@ int PyUnicode_Contains(PyObject *container,
     /* Check v in u */
     if (PyUnicode_GET_SIZE(v) != 1) {
 	PyErr_SetString(PyExc_TypeError,
-			"string member test needs char left operand");
+	    "'in <string>' requires character as left operand");
 	goto onError;
     }
     ch = *PyUnicode_AS_UNICODE(v);

Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ PyObject a, el;`
`393`	`393`	`return PyUnicode_Contains(a, el);`
`394`	`394`	`if (!PyString_Check(el) \|\| PyString_Size(el) != 1) {`
`395`	`395`	`PyErr_SetString(PyExc_TypeError,`
`396`		`- "string member test needs char left operand");`
	`396`	`+ "'in <string>' requires character as left operand");`
`397`	`397`	`return -1;`
`398`	`398`	`}`
`399`	`399`	`c = PyString_AsString(el)[0];`
Original file line number	Diff line number	Diff line change
`@@ -2996,7 +2996,7 @@ int PyUnicode_Contains(PyObject *container,`
`2996`	`2996`	`/* Check v in u */`
`2997`	`2997`	`if (PyUnicode_GET_SIZE(v) != 1) {`
`2998`	`2998`	`PyErr_SetString(PyExc_TypeError,`
`2999`		`- "string member test needs char left operand");`
	`2999`	`+ "'in <string>' requires character as left operand");`
`3000`	`3000`	`goto onError;`
`3001`	`3001`	`}`
`3002`	`3002`	`ch = *PyUnicode_AS_UNICODE(v);`