summaryrefslogtreecommitdiffstats
path: root/Python/pystrtod.c
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-01-24 10:16:29 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-01-24 10:16:29 (GMT)
commitf41d29a8ebc27aafc18b6850648f1faa918e0e5d (patch)
tree38917acb50a407fa40c89f518feed3c2bfc778c9 /Python/pystrtod.c
parent53ab5cbcc703f9e30ccc49a6206565db3d142c7b (diff)
downloadcpython-f41d29a8ebc27aafc18b6850648f1faa918e0e5d.zip
cpython-f41d29a8ebc27aafc18b6850648f1faa918e0e5d.tar.gz
cpython-f41d29a8ebc27aafc18b6850648f1faa918e0e5d.tar.bz2
Merged revisions 77691,77698,77713-77714 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r77691 | mark.dickinson | 2010-01-22 16:18:09 +0000 (Fri, 22 Jan 2010) | 1 line Correct typo in comment. ........ r77698 | mark.dickinson | 2010-01-22 17:04:07 +0000 (Fri, 22 Jan 2010) | 3 lines Issue #7743: Fix a potential incorrect rounding bug in dtoa.c (2nd bug in issue 7743). ........ r77713 | mark.dickinson | 2010-01-23 20:48:56 +0000 (Sat, 23 Jan 2010) | 3 lines Issue #7743: Add checks for zero inputs to the lshift and mult functions; this fixes the first bug described in issue #7743. ........ r77714 | mark.dickinson | 2010-01-23 21:25:53 +0000 (Sat, 23 Jan 2010) | 1 line dtoa.c fix from upstream that fixes incorrectly rounded results for certain subnormals that are also halfway cases. ........
Diffstat (limited to 'Python/pystrtod.c')
-rw-r--r--Python/pystrtod.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/pystrtod.c b/Python/pystrtod.c
index d1eb71d..5543c58 100644
--- a/Python/pystrtod.c
+++ b/Python/pystrtod.c
@@ -104,7 +104,7 @@ _PyOS_ascii_strtod(const char *nptr, char **endptr)
_Py_SET_53BIT_PRECISION_END;
if (*endptr == nptr)
- /* string might represent and inf or nan */
+ /* string might represent an inf or nan */
result = _Py_parse_inf_or_nan(nptr, endptr);
return result;