summaryrefslogtreecommitdiff
path: root/Python/pystrtod.c
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-01-24 10:16:59 +0000
committerMark Dickinson <dickinsm@gmail.com>2010-01-24 10:16:59 +0000
commit95a3633c9612cefb137f8f3bcf305b9d8a923688 (patch)
treee13c9fac805fd2d2d00edb8dd73c12480752ccb8 /Python/pystrtod.c
parent68338cd63f8c9ce42c638e492b492b8a0a8c1cc5 (diff)
downloadcpython-git-95a3633c9612cefb137f8f3bcf305b9d8a923688.tar.gz
Merged revisions 77722 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77722 | mark.dickinson | 2010-01-24 10:16:29 +0000 (Sun, 24 Jan 2010) | 23 lines 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 95c0ff6376..c2ce71dbfd 100644
--- a/Python/pystrtod.c
+++ b/Python/pystrtod.c
@@ -101,7 +101,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;