diff options
author | Jeremy Hylton <jeremy@alum.mit.edu> | 2001-04-19 16:43:49 (GMT) |
---|---|---|
committer | Jeremy Hylton <jeremy@alum.mit.edu> | 2001-04-19 16:43:49 (GMT) |
commit | b8a93215c2b5db2cc88bbc7ce898ae2be64d6e1f (patch) | |
tree | 45811b52edff1547343b6286b8063d995d728d80 /Objects/unicodeobject.c | |
parent | bd7f818c508248e12f88e51198cb5e9b861dacbf (diff) | |
download | cpython-b8a93215c2b5db2cc88bbc7ce898ae2be64d6e1f.zip cpython-b8a93215c2b5db2cc88bbc7ce898ae2be64d6e1f.tar.gz cpython-b8a93215c2b5db2cc88bbc7ce898ae2be64d6e1f.tar.bz2 |
Revert previous checkin, which caused test_unicodedata to fail.
Diffstat (limited to 'Objects/unicodeobject.c')
-rw-r--r-- | Objects/unicodeobject.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index d2aa08a..b623c20 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -90,8 +90,6 @@ static PyUnicodeObject *unicode_empty; static PyUnicodeObject *unicode_freelist; static int unicode_freelist_size; -static PyUnicodeObject *unicode_ascii[128]; - /* Default encoding to use and assume when NULL is passed as encoding parameter; it is initialized by _PyUnicode_Init(). @@ -253,19 +251,6 @@ PyObject *PyUnicode_FromUnicode(const Py_UNICODE *u, { PyUnicodeObject *unicode; - if (size == 1 && *u < 128) { - unicode = unicode_ascii[*u]; - if (!unicode) { - unicode = _PyUnicode_New(1); - unicode->str[0] = *u; - if (!unicode) - return NULL; - unicode_ascii[*u] = unicode; - } - Py_INCREF(unicode); - return (PyObject*)unicode; - } - unicode = _PyUnicode_New(size); if (!unicode) return NULL; @@ -1670,11 +1655,6 @@ PyObject *PyUnicode_DecodeASCII(const char *s, { PyUnicodeObject *v; Py_UNICODE *p; - - if (size == 1 && *(unsigned char*)s < 128) { - Py_UNICODE r = *(unsigned char*)s; - return PyUnicode_FromUnicode(&r, 1); - } /* ASCII is equivalent to the first 128 ordinals in Unicode. */ v = _PyUnicode_New(size); @@ -5209,8 +5189,6 @@ PyTypeObject PyUnicode_Type = { void _PyUnicode_Init(void) { - int i; - /* Doublecheck the configuration... */ if (sizeof(Py_UNICODE) != 2) Py_FatalError("Unicode configuration error: " @@ -5221,9 +5199,6 @@ void _PyUnicode_Init(void) unicode_freelist_size = 0; unicode_empty = _PyUnicode_New(0); strcpy(unicode_default_encoding, "ascii"); - - for (i = 0; i < 128; i++) - unicode_ascii[i] = NULL; } /* Finalize the Unicode implementation */ @@ -5232,18 +5207,10 @@ void _PyUnicode_Fini(void) { PyUnicodeObject *u; - int i; Py_XDECREF(unicode_empty); unicode_empty = NULL; - for (i = 0; i < 128; i++) { - if (unicode_ascii[i]) { - Py_DECREF(unicode_ascii[i]); - unicode_ascii[i] = NULL; - } - } - for (u = unicode_freelist; u != NULL;) { PyUnicodeObject *v = u; u = *(PyUnicodeObject **)u; |