mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Changed to use 'U' argument to PyArg_ParseTuple, instead of manually checking for unicode objects.

Browse source
This commit is contained in:
Eric Smith 2007-09-01 10:56:01 +00:00
parent a95207ab3b
commit 37f10386f1
6 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Objects/stringlib/formatter.h
View file

@ -768,12 +768,8 @@ FORMAT_STRING(PyObject* value, PyObject* args)
PyObject *result = NULL;
InternalFormatSpec format;
if (!PyArg_ParseTuple(args, "O:__format__", &format_spec))
if (!PyArg_ParseTuple(args, STRINGLIB_PARSE_CODE ":__format__", &format_spec))
goto done;
if (!STRINGLIB_CHECK(format_spec)) {
PyErr_SetString(PyExc_TypeError, STRINGLIB_TYPE_NAME " object required");
goto done;
}
/* check for the special case of zero length format spec, make
it equivalent to str(value) */
@ -843,12 +839,8 @@ FORMAT_LONG(PyObject* value, PyObject* args)
PyObject *tmp = NULL;
InternalFormatSpec format;
if (!PyArg_ParseTuple(args, "O:__format__", &format_spec))
if (!PyArg_ParseTuple(args, STRINGLIB_PARSE_CODE ":__format__", &format_spec))
goto done;
if (!STRINGLIB_CHECK(format_spec)) {
PyErr_SetString(PyExc_TypeError, STRINGLIB_TYPE_NAME " object required");
goto done;
}
/* check for the special case of zero length format spec, make
it equivalent to str(value) */
@ -917,12 +909,8 @@ FORMAT_FLOAT(PyObject *value, PyObject *args)
PyObject *tmp = NULL;
InternalFormatSpec format;
if (!PyArg_ParseTuple(args, "O:__format__", &format_spec))
if (!PyArg_ParseTuple(args, STRINGLIB_PARSE_CODE ":__format__", &format_spec))
goto done;
if (!STRINGLIB_CHECK(format_spec)) {
PyErr_SetString(PyExc_TypeError, STRINGLIB_TYPE_NAME " object required");
goto done;
}
/* check for the special case of zero length format spec, make
it equivalent to str(value) */

1
Objects/stringlib/stringdefs.h
View file

@ -8,6 +8,7 @@
#define STRINGLIB_CHAR char
#define STRINGLIB_TYPE_NAME "string"
#define STRINGLIB_PARSE_CODE "S"
#define STRINGLIB_EMPTY string_empty
#define STRINGLIB_ISDECIMAL(x) ((x >= '0') && (x <= '9'))
#define STRINGLIB_TODECIMAL(x) (STRINGLIB_ISDECIMAL(x) ? (x - '0') : -1)

1
Objects/stringlib/unicodedefs.h
View file

@ -8,6 +8,7 @@
#define STRINGLIB_CHAR Py_UNICODE
#define STRINGLIB_TYPE_NAME "unicode"
#define STRINGLIB_PARSE_CODE "U"
#define STRINGLIB_EMPTY unicode_empty
#define STRINGLIB_ISDECIMAL Py_UNICODE_ISDECIMAL
#define STRINGLIB_TODECIMAL Py_UNICODE_TODECIMAL