diff options
| author | Walter Dörwald <walter@livinglogic.de> | 2007-06-11 14:55:19 (GMT) |
|---|---|---|
| committer | Walter Dörwald <walter@livinglogic.de> | 2007-06-11 14:55:19 (GMT) |
| commit | 7815c5e91e22a7f6dfb6b64357d25982f91ea46e (patch) | |
| tree | 93ebaccba41b91f58ec27a0b0f29a949f31b677f /Objects | |
| parent | 4dbd01b43506ead947f774bcfdddf52219f862f0 (diff) | |
| download | cpython-7815c5e91e22a7f6dfb6b64357d25982f91ea46e.zip cpython-7815c5e91e22a7f6dfb6b64357d25982f91ea46e.tar.gz cpython-7815c5e91e22a7f6dfb6b64357d25982f91ea46e.tar.bz2 | |
Check unicode identifier directly instead of converting
it to an 8bit string first.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/typeobject.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index bc5fad1..b826eb4 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -1561,7 +1561,7 @@ static PyGetSetDef subtype_getsets_weakref_only[] = { static int valid_identifier(PyObject *s) { - unsigned char *p; + Py_UNICODE *p; Py_ssize_t i, n; if (!PyUnicode_Check(s)) { @@ -1570,14 +1570,14 @@ valid_identifier(PyObject *s) s->ob_type->tp_name); return 0; } - p = (unsigned char *) PyUnicode_AsString(s); - n = strlen((char*)p)/*XXX PyString_GET_SIZE(s)*/; + p = PyUnicode_AS_UNICODE(s); + n = PyUnicode_GET_SIZE(s); /* We must reject an empty name. As a hack, we bump the length to 1 so that the loop will balk on the trailing \0. */ if (n == 0) n = 1; for (i = 0; i < n; i++, p++) { - if (!(i == 0 ? isalpha(*p) : isalnum(*p)) && *p != '_') { + if (i > 255 || (!(i == 0 ? isalpha(*p) : isalnum(*p)) && *p != '_')) { PyErr_SetString(PyExc_TypeError, "__slots__ must be identifiers"); return 0; |