From aa77d26009456a447dc95f748533d64cb6a1b50a Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Sun, 3 May 2009 21:07:13 +0000 Subject: Merged revisions 72253 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72253 | mark.dickinson | 2009-05-03 21:59:48 +0100 (Sun, 03 May 2009) | 2 lines Eliminate some locale-dependent calls to isspace and tolower. ........ --- Objects/complexobject.c | 8 ++++---- Objects/floatobject.c | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Objects/complexobject.c b/Objects/complexobject.c index 4dd6151..8fdbd37 100644 --- a/Objects/complexobject.c +++ b/Objects/complexobject.c @@ -767,13 +767,13 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v) /* position on first nonblank */ start = s; - while (*s && isspace(Py_CHARMASK(*s))) + while (Py_ISSPACE(*s)) s++; if (*s == '(') { /* Skip over possible bracket from repr(). */ got_bracket = 1; s++; - while (*s && isspace(Py_CHARMASK(*s))) + while (Py_ISSPACE(*s)) s++; } @@ -856,7 +856,7 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v) } /* trailing whitespace and closing bracket */ - while (*s && isspace(Py_CHARMASK(*s))) + while (Py_ISSPACE(*s)) s++; if (got_bracket) { /* if there was an opening parenthesis, then the corresponding @@ -864,7 +864,7 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v) if (*s != ')') goto parse_error; s++; - while (*s && isspace(Py_CHARMASK(*s))) + while (Py_ISSPACE(*s)) s++; } diff --git a/Objects/floatobject.c b/Objects/floatobject.c index 0619877..1071fae 100644 --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -188,7 +188,7 @@ PyFloat_FromString(PyObject *v) } last = s + len; - while (*s && isspace(Py_CHARMASK(*s))) + while (Py_ISSPACE(*s)) s++; /* We don't care about overflow or underflow. If the platform * supports them, infinities and signed zeroes (on underflow) are @@ -196,7 +196,7 @@ PyFloat_FromString(PyObject *v) x = PyOS_string_to_double(s, (char **)&end, NULL); if (x == -1.0 && PyErr_Occurred()) goto error; - while (*end && isspace(Py_CHARMASK(*end))) + while (Py_ISSPACE(*end)) end++; if (end == last) result = PyFloat_FromDouble(x); @@ -1223,7 +1223,7 @@ float_fromhex(PyObject *cls, PyObject *arg) ********************/ /* leading whitespace and optional sign */ - while (isspace(Py_CHARMASK(*s))) + while (Py_ISSPACE(*s)) s++; if (*s == '-') { s++; @@ -1247,7 +1247,7 @@ float_fromhex(PyObject *cls, PyObject *arg) s_store = s; if (*s == '0') { s++; - if (tolower(*s) == (int)'x') + if (*s == 'x' || *s == 'X') s++; else s = s_store; @@ -1277,7 +1277,7 @@ float_fromhex(PyObject *cls, PyObject *arg) goto insane_length_error; /* [p ] */ - if (tolower(*s) == (int)'p') { + if (*s == 'p' || *s == 'P') { s++; exp_start = s; if (*s == '-' || *s == '+') @@ -1293,7 +1293,7 @@ float_fromhex(PyObject *cls, PyObject *arg) exp = 0; /* optional trailing whitespace leading to the end of the string */ - while (isspace(Py_CHARMASK(*s))) + while (Py_ISSPACE(*s)) s++; if (s != s_end) goto parse_error; -- cgit v0.12