mirror of
https://github.com/python/cpython.git
synced 2025-08-02 16:13:13 +00:00
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60875,60880-60881,60886,60888-60890,60892,60894-60898,60900-60931,60933-60958 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r60901 | eric.smith | 2008-02-19 14:21:56 +0100 (Tue, 19 Feb 2008) | 1 line Added PEP 3101. ........ r60907 | georg.brandl | 2008-02-20 20:12:36 +0100 (Wed, 20 Feb 2008) | 2 lines Fixes contributed by Ori Avtalion. ........ r60909 | eric.smith | 2008-02-21 00:34:22 +0100 (Thu, 21 Feb 2008) | 1 line Trim leading zeros from a floating point exponent, per C99. See issue 1600. As far as I know, this only affects Windows. Add float type 'n' to PyOS_ascii_formatd (see PEP 3101 for 'n' description). ........ r60910 | eric.smith | 2008-02-21 00:39:28 +0100 (Thu, 21 Feb 2008) | 1 line Now that PyOS_ascii_formatd supports the 'n' format, simplify the float formatting code to just call it. ........ r60918 | andrew.kuchling | 2008-02-21 15:23:38 +0100 (Thu, 21 Feb 2008) | 2 lines Close manifest file. This change doesn't make any difference to CPython, but is a necessary fix for Jython. ........ r60921 | guido.van.rossum | 2008-02-21 18:46:16 +0100 (Thu, 21 Feb 2008) | 2 lines Remove news about float repr() -- issue 1580 is still in limbo. ........ r60923 | guido.van.rossum | 2008-02-21 19:18:37 +0100 (Thu, 21 Feb 2008) | 5 lines Removed uses of dict.has_key() from distutils, and uses of callable() from copy_reg.py, so the interpreter now starts up without warnings when '-3' is given. More work like this needs to be done in the rest of the stdlib. ........ r60924 | thomas.heller | 2008-02-21 19:28:48 +0100 (Thu, 21 Feb 2008) | 4 lines configure.ac: Remove the configure check for _Bool, it is already done in the top-level Python configure script. configure, fficonfig.h.in: regenerated. ........ r60925 | thomas.heller | 2008-02-21 19:52:20 +0100 (Thu, 21 Feb 2008) | 3 lines Replace 'has_key()' with 'in'. Replace 'raise Error, stuff' with 'raise Error(stuff)'. ........ r60927 | raymond.hettinger | 2008-02-21 20:24:53 +0100 (Thu, 21 Feb 2008) | 1 line Update more instances of has_key(). ........ r60928 | guido.van.rossum | 2008-02-21 20:46:35 +0100 (Thu, 21 Feb 2008) | 3 lines Fix a few typos and layout glitches (more work is needed). Move 2.5 news to Misc/HISTORY. ........ r60936 | georg.brandl | 2008-02-21 21:33:38 +0100 (Thu, 21 Feb 2008) | 2 lines #2079: typo in userdict docs. ........ r60938 | georg.brandl | 2008-02-21 21:38:13 +0100 (Thu, 21 Feb 2008) | 2 lines Part of #2154: minimal syntax fixes in doc example snippets. ........ r60942 | raymond.hettinger | 2008-02-22 04:16:42 +0100 (Fri, 22 Feb 2008) | 1 line First draft for itertools.product(). Docs and other updates forthcoming. ........ r60955 | nick.coghlan | 2008-02-22 11:54:06 +0100 (Fri, 22 Feb 2008) | 1 line Try to make command line error messages from runpy easier to understand (and suppress traceback cruft from the implicitly invoked runpy machinery) ........ r60956 | georg.brandl | 2008-02-22 13:31:45 +0100 (Fri, 22 Feb 2008) | 2 lines A lot more typo fixes by Ori Avtalion. ........ r60957 | georg.brandl | 2008-02-22 13:56:34 +0100 (Fri, 22 Feb 2008) | 2 lines Don't reference pyshell. ........ r60958 | georg.brandl | 2008-02-22 13:57:05 +0100 (Fri, 22 Feb 2008) | 2 lines Another fix. ........
This commit is contained in:
Christian Heimes
parent
86bc17944f
commit
c3f30c4337
41 changed files with 5703 additions and 3333 deletions
|
|
@ -130,16 +130,16 @@ parse_internal_render_format_spec(PyObject *format_spec,
|
|||
}
|
||||
else if (end-ptr >= 1 && is_alignment_token(ptr[0])) {
|
||||
format->align = ptr[0];
|
||||
ptr++;
|
||||
++ptr;
|
||||
}
|
||||
|
||||
/* Parse the various sign options */
|
||||
if (end-ptr >= 1 && is_sign_element(ptr[0])) {
|
||||
format->sign = ptr[0];
|
||||
ptr++;
|
||||
++ptr;
|
||||
#if ALLOW_PARENS_FOR_SIGN
|
||||
if (end-ptr >= 1 && ptr[0] == ')') {
|
||||
ptr++;
|
||||
++ptr;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
@ -150,7 +150,7 @@ parse_internal_render_format_spec(PyObject *format_spec,
|
|||
if (format->align == '\0') {
|
||||
format->align = '=';
|
||||
}
|
||||
ptr++;
|
||||
++ptr;
|
||||
}
|
||||
|
||||
/* XXX add error checking */
|
||||
|
|
@ -165,7 +165,7 @@ parse_internal_render_format_spec(PyObject *format_spec,
|
|||
|
||||
/* Parse field precision */
|
||||
if (end-ptr && ptr[0] == '.') {
|
||||
ptr++;
|
||||
++ptr;
|
||||
|
||||
/* XXX add error checking */
|
||||
specified_width = get_integer(&ptr, end, &format->precision);
|
||||
|
|
@ -189,7 +189,7 @@ parse_internal_render_format_spec(PyObject *format_spec,
|
|||
|
||||
if (end-ptr == 1) {
|
||||
format->type = ptr[0];
|
||||
ptr++;
|
||||
++ptr;
|
||||
}
|
||||
|
||||
return 1;
|
||||
|
|
@ -570,7 +570,7 @@ format_int_or_long_internal(PyObject *value, const InternalFormatSpec *format,
|
|||
/* if X, convert to uppercase */
|
||||
if (format->type == 'X') {
|
||||
Py_ssize_t t;
|
||||
for (t = 0; t < n_digits; t++)
|
||||
for (t = 0; t < n_digits; ++t)
|
||||
p[t + n_leading_chars] = STRINGLIB_TOUPPER(p[t + n_leading_chars]);
|
||||
}
|
||||
|
||||
|
|
@ -596,37 +596,20 @@ strtounicode(Py_UNICODE *buffer, const char *charbuffer)
|
|||
{
|
||||
register Py_ssize_t i;
|
||||
Py_ssize_t len = strlen(charbuffer);
|
||||
for (i = len - 1; i >= 0; i--)
|
||||
for (i = len - 1; i >= 0; --i)
|
||||
buffer[i] = (Py_UNICODE) charbuffer[i];
|
||||
|
||||
return len;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* the callback function to call to do the actual float formatting.
|
||||
it matches the definition of PyOS_ascii_formatd */
|
||||
typedef char*
|
||||
(*DoubleSnprintfFunction)(char *buffer, size_t buf_len,
|
||||
const char *format, double d);
|
||||
|
||||
/* just a wrapper to make PyOS_snprintf look like DoubleSnprintfFunction */
|
||||
static char*
|
||||
snprintf_double(char *buffer, size_t buf_len, const char *format, double d)
|
||||
{
|
||||
PyOS_snprintf(buffer, buf_len, format, d);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* see FORMATBUFLEN in unicodeobject.c */
|
||||
#define FLOAT_FORMATBUFLEN 120
|
||||
|
||||
/* much of this is taken from unicodeobject.c */
|
||||
/* use type instead of format->type, so that it can be overridden by
|
||||
format_number() */
|
||||
static PyObject *
|
||||
_format_float(STRINGLIB_CHAR type, PyObject *value,
|
||||
const InternalFormatSpec *format,
|
||||
DoubleSnprintfFunction snprintf)
|
||||
format_float_internal(PyObject *value,
|
||||
const InternalFormatSpec *format)
|
||||
{
|
||||
/* fmt = '%.' + `prec` + `type` + '%%'
|
||||
worst case length = 2 + 10 (len of INT_MAX) + 1 + 2 = 15 (use 20)*/
|
||||
|
|
@ -658,6 +641,7 @@ _format_float(STRINGLIB_CHAR type, PyObject *value,
|
|||
char* trailing = "";
|
||||
STRINGLIB_CHAR *p;
|
||||
NumberFieldWidths spec;
|
||||
STRINGLIB_CHAR type = format->type;
|
||||
|
||||
#if STRINGLIB_IS_UNICODE
|
||||
Py_UNICODE unicodebuf[FLOAT_FORMATBUFLEN];
|
||||
|
|
@ -692,8 +676,8 @@ _format_float(STRINGLIB_CHAR type, PyObject *value,
|
|||
PyOS_snprintf(fmt, sizeof(fmt), "%%.%" PY_FORMAT_SIZE_T "d%c", precision,
|
||||
(char)type);
|
||||
|
||||
/* call the passed in function to do the actual formatting */
|
||||
snprintf(charbuf, sizeof(charbuf), fmt, x);
|
||||
/* do the actual formatting */
|
||||
PyOS_ascii_formatd(charbuf, sizeof(charbuf), fmt, x);
|
||||
|
||||
/* adding trailing to fmt with PyOS_snprintf doesn't work, not
|
||||
sure why. we'll just concatentate it here, no harm done. we
|
||||
|
|
@ -719,8 +703,8 @@ _format_float(STRINGLIB_CHAR type, PyObject *value,
|
|||
and skip it */
|
||||
sign = p[0];
|
||||
if (sign == '-') {
|
||||
p++;
|
||||
n_digits--;
|
||||
++p;
|
||||
--n_digits;
|
||||
}
|
||||
|
||||
calc_number_widths(&spec, sign, n_digits, format);
|
||||
|
|
@ -743,15 +727,6 @@ _format_float(STRINGLIB_CHAR type, PyObject *value,
|
|||
done:
|
||||
return result;
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
format_float_internal(PyObject *value, const InternalFormatSpec *format)
|
||||
{
|
||||
if (format->type == 'n')
|
||||
return _format_float('f', value, format, snprintf_double);
|
||||
else
|
||||
return _format_float(format->type, value, format, PyOS_ascii_formatd);
|
||||
}
|
||||
#endif /* FORMAT_FLOAT */
|
||||
|
||||
/************************************************************************/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue