diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-03-29 15:19:47 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-03-29 15:19:47 (GMT) |
| commit | c8a608c6668df607638d00771d70b778b91bca81 (patch) | |
| tree | ef8b929ab797155a6b23f535f5085c89fc60e84e | |
| parent | 48e2478329b6be67d7858174d146d65f6ccfe728 (diff) | |
| download | cpython-c8a608c6668df607638d00771d70b778b91bca81.zip cpython-c8a608c6668df607638d00771d70b778b91bca81.tar.gz cpython-c8a608c6668df607638d00771d70b778b91bca81.tar.bz2 | |
Merged revisions 70678 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70678 | mark.dickinson | 2009-03-29 15:37:51 +0100 (Sun, 29 Mar 2009) | 3 lines
Issue #532631: Replace confusing fabs(x)/1e25 >= 1e25 test
with fabs(x) >= 1e50, and fix documentation.
........
| -rw-r--r-- | Doc/library/stdtypes.rst | 2 | ||||
| -rw-r--r-- | Objects/stringlib/formatter.h | 2 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 608cb07..a51fb75 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1322,7 +1322,7 @@ that ``'\0'`` is the end of the string. .. XXX Examples? For safety reasons, floating point precisions are clipped to 50; ``%f`` -conversions for numbers whose absolute value is over 1e25 are replaced by ``%g`` +conversions for numbers whose absolute value is over 1e50 are replaced by ``%g`` conversions. [#]_ All other errors raise exceptions. .. index:: diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h index 2e3e5a6..86235a6 100644 --- a/Objects/stringlib/formatter.h +++ b/Objects/stringlib/formatter.h @@ -789,7 +789,7 @@ format_float_internal(PyObject *value, if (precision < 0) precision = 6; - if (type == 'f' && (fabs(x) / 1e25) >= 1e25) + if (type == 'f' && fabs(x) >= 1e50) type = 'g'; /* cast "type", because if we're in unicode we need to pass a diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index bcae239..f15e7cd 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -8847,7 +8847,7 @@ formatfloat(Py_UNICODE *buf, return -1; if (prec < 0) prec = 6; - if (type == 'f' && (fabs(x) / 1e25) >= 1e25) + if (type == 'f' && fabs(x) >= 1e50) type = 'g'; /* Worst case length calc to ensure no buffer overrun: |