Merged revisions 62199 via svnmerge from

martin.v.loewis · martin.v.loewis · commit bb404e8cbae8 · 2008-04-07T03:22:07.000Z
svn+ssh://pythondev@svn.python.org/python/trunk ........ r62199 | martin.v.loewis | 2008-04-07 05:08:28 +0200 (Mo, 07 Apr 2008) | 2 lines Bug #2388: Fix gcc warnings when compiling with --enable-unicode=ucs4. ........ git-svn-id: http://svn.python.org/projects/python/branches/py3k@62201 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h
@@ -785,8 +785,19 @@ FORMAT_STRING(PyObject* value, PyObject* args)
         break;
     default:
         /* unknown */
-        PyErr_Format(PyExc_ValueError, "Unknown conversion type %c",
-                     format.type);
+	#if STRINGLIB_IS_UNICODE
+	/* If STRINGLIB_CHAR is Py_UNICODE, %c might be out-of-range,
+	   hence the two cases. If it is char, gcc complains that the
+	   condition below is always true, hence the ifdef. */
+        if (format.type > 32 && format.type <128)
+	#endif
+            PyErr_Format(PyExc_ValueError, "Unknown conversion type %c",
+                         (char)format.type);
+	#if STRINGLIB_IS_UNICODE
+	else
+            PyErr_Format(PyExc_ValueError, "Unknown conversion type '\\x%x'",
+                         (unsigned int)format.type);
+	#endif
         goto done;
     }
 
diff --git a/Objects/stringlib/string_format.h b/Objects/stringlib/string_format.h
@@ -740,9 +740,17 @@ do_conversion(PyObject *obj, STRINGLIB_CHAR conversion)
     case 's':
         return STRINGLIB_TOSTR(obj);
     default:
-        PyErr_Format(PyExc_ValueError,
-                     "Unknown converion specifier %c",
-                     conversion);
+	if (conversion > 32 && conversion < 127) {
+		/* It's the ASCII subrange; casting to char is safe
+		   (assuming the execution character set is an ASCII
+		   superset). */
+        	PyErr_Format(PyExc_ValueError,
+                     "Unknown conversion specifier %c",
+                     (char)conversion);
+	} else
+		PyErr_Format(PyExc_ValueError,
+		     "Unknown conversion specifier \\x%x",
+		     (unsigned int)conversion);
         return NULL;
     }
 }
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -8895,7 +8895,7 @@ PyObject *PyUnicode_Format(PyObject *format,
 		if (!isnumok) {
 			PyErr_Format(PyExc_TypeError, 
 			    "%%%c format: a number is required, "
-			    "not %.200s", c, Py_TYPE(v)->tp_name);
+                                     "not %.200s", (char)c, Py_TYPE(v)->tp_name);
 			goto onError;
 		}
 		if (flags & F_ZERO)

Original file line number	Diff line number	Diff line change
`@@ -8895,7 +8895,7 @@ PyObject PyUnicode_Format(PyObject format,`
`8895`	`8895`	`if (!isnumok) {`
`8896`	`8896`	`PyErr_Format(PyExc_TypeError,`
`8897`	`8897`	`"%%%c format: a number is required, "`
`8898`		`- "not %.200s", c, Py_TYPE(v)->tp_name);`
	`8898`	`+ "not %.200s", (char)c, Py_TYPE(v)->tp_name);`
`8899`	`8899`	`goto onError;`
`8900`	`8900`	`}`
`8901`	`8901`	`if (flags & F_ZERO)`