Mercurial > cpython-lru_cache-weakref
diff Objects/classobject.c @ 42013:cd125fe83051
Make identifiers str (not str8) objects throughout.
This affects the parser, various object implementations,
and all places that put identifiers into C string literals.
In testing, a number of crashes occurred as code would
fail when the recursion limit was reached (such as the
Unicode interning dictionary having key/value pairs where
key is not value). To solve these, I added an overflowed
flag, which allows for 50 more recursions after the
limit was reached and the exception was raised, and
a recursion_critical flag, which indicates that recursion
absolutely must be allowed, i.e. that a certain call
must not cause a stack overflow exception.
There are still some places where both str and str8 are
accepted as identifiers; these should eventually be
removed.
| author | Martin v. Löwis <martin@v.loewis.de> |
|---|---|
| date | Sun, 10 Jun 2007 09:51:05 +0000 |
| parents | bee8d01ef42c |
| children | 7990bb2759cb |
line wrap: on
line diff
--- a/Objects/classobject.c Sat Jun 09 16:13:23 2007 +0000 +++ b/Objects/classobject.c Sun Jun 10 09:51:05 2007 +0000 @@ -100,7 +100,7 @@ { static PyObject *docstr; if (docstr == NULL) { - docstr= PyString_InternFromString("__doc__"); + docstr= PyUnicode_InternFromString("__doc__"); if (docstr == NULL) return NULL; } @@ -235,12 +235,12 @@ return NULL; PyErr_Clear(); } - else if (!PyString_Check(funcname)) { + else if (!PyUnicode_Check(funcname)) { Py_DECREF(funcname); funcname = NULL; } else - sfuncname = PyString_AS_STRING(funcname); + sfuncname = PyUnicode_AsString(funcname); if (klass == NULL) klassname = NULL; else { @@ -250,12 +250,12 @@ return NULL; PyErr_Clear(); } - else if (!PyString_Check(klassname)) { + else if (!PyUnicode_Check(klassname)) { Py_DECREF(klassname); klassname = NULL; } else - sklassname = PyString_AS_STRING(klassname); + sklassname = PyUnicode_AsString(klassname); } if (self == NULL) result = PyUnicode_FromFormat("<unbound method %s.%s>",