Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 69806 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69806 | eric.smith | 2009-02-20 09:02:36 -0500 (Fri, 20 Feb 2009) | 1 line

  Issue #5247: Improve error message when unknown format codes are used when using str.format() with str, int, and float arguments.
........
This commit is contained in:
Eric Smith 2009-02-20 14:25:03 +00:00
parent 247a9b87bd
commit 5e5c0db5d7
2 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Misc/NEWS
View File

@ -12,6 +12,10 @@ What's New in Python 3.1 alpha 0
Core and Builtins
-----------------
=======
- Issue #5247: Improve error message when unknown format codes are
used when using str.format() with str, int, and float arguments.
- Issue #5249: time.strftime returned malformed string when format string
contained non ascii character on windows.

48
Objects/stringlib/formatter.h
View File

@ -15,6 +15,34 @@
#define ALLOW_PARENS_FOR_SIGN 0
/* Raises an exception about an unknown presentation type for this
* type. */
static void
unknown_presentation_type(STRINGLIB_CHAR presentation_type,
const char* type_name)
{
#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 (presentation_type > 32 && presentation_type < 128)
#endif
PyErr_Format(PyExc_ValueError,
"Unknown format code '%c' "
"for object of type '%.200s'",
presentation_type,
type_name);
#if STRINGLIB_IS_UNICODE
else
PyErr_Format(PyExc_ValueError,
"Unknown format code '\\x%x' "
"for object of type '%.200s'",
(unsigned int)presentation_type,
type_name);
#endif
}
/*
get_integer consumes 0 or more decimal digit characters from an
input string, updates *result with the corresponding positive
@ -854,19 +882,7 @@ FORMAT_STRING(PyObject *obj,
break;
default:
/* unknown */
#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
unknown_presentation_type(format.type, obj->ob_type->tp_name);
goto done;
}
@ -928,8 +944,7 @@ format_int_or_long(PyObject* obj,
default:
/* unknown */
PyErr_Format(PyExc_ValueError, "Unknown conversion type %c",
format.type);
unknown_presentation_type(format.type, obj->ob_type->tp_name);
goto done;
}
@ -1031,8 +1046,7 @@ FORMAT_FLOAT(PyObject *obj,
default:
/* unknown */
PyErr_Format(PyExc_ValueError, "Unknown conversion type %c",
format.type);
unknown_presentation_type(format.type, obj->ob_type->tp_name);
goto done;
}