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

Merged revisions 74269 via svnmerge from 

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

........
  r74269 | eric.smith | 2009-07-30 09:39:44 -0400 (Thu, 30 Jul 2009) | 1 line

  Issue 6330: Fix --enable-unicode=ucs4.
........
This commit is contained in:
Eric Smith 2009-07-30 13:43:08 +00:00
parent c5e2bb9706
commit beddd709b2
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Objects/stringlib/formatter.h
View File

@ -32,7 +32,7 @@ unknown_presentation_type(STRINGLIB_CHAR presentation_type,
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"Unknown format code '%c' " "Unknown format code '%c' "
"for object of type '%.200s'", "for object of type '%.200s'",
presentation_type, (char)presentation_type,
type_name); type_name);
#if STRINGLIB_IS_UNICODE #if STRINGLIB_IS_UNICODE
else else
@ -44,6 +44,24 @@ unknown_presentation_type(STRINGLIB_CHAR presentation_type,
#endif #endif
} }
static void
invalid_comma_type(STRINGLIB_CHAR presentation_type)
{
#if STRINGLIB_IS_UNICODE
/* See comment in unknown_presentation_type */
if (presentation_type > 32 && presentation_type < 128)
#endif
PyErr_Format(PyExc_ValueError,
"Cannot specify ',' with '%c'.",
(char)presentation_type);
#if STRINGLIB_IS_UNICODE
else
PyErr_Format(PyExc_ValueError,
"Cannot specify ',' with '\\x%x'.",
(unsigned int)presentation_type);
#endif
}
/* /*
get_integer consumes 0 or more decimal digit characters from an get_integer consumes 0 or more decimal digit characters from an
input string, updates *result with the corresponding positive input string, updates *result with the corresponding positive
@ -253,8 +271,7 @@ parse_internal_render_format_spec(STRINGLIB_CHAR *format_spec,
/* These are allowed. See PEP 378.*/ /* These are allowed. See PEP 378.*/
break; break;
default: default:
PyErr_Format(PyExc_ValueError, invalid_comma_type(format->type);
"Cannot specify ',' with '%c'.", format->type);
return 0; return 0;
} }
} }