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.
........

diff --git a/Objects/complexobject.c b/Objects/complexobject.c
index 4dd6151ef944ce29f8fbda4fd7c70ea27ae331ac..8fdbd37d0b6bd9023c5c922e32c275ff9925e2a1 100644 (file)
--- 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 061987722ce23f540ddd9bc99f2d5a3f0e428bbb..1071fae99f1a0f514217c360c6db311592b7d94f 100644 (file)
--- 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 <exponent>] */
-       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;