Mercurial > cpython-lru_cache-weakref
diff Objects/typeobject.c @ 42862:ed1594a16bdb
Use unicode and remove support for some uses of str8.
| author | Neal Norwitz <nnorwitz@gmail.com> |
|---|---|
| date | Sun, 26 Aug 2007 06:45:23 +0000 |
| parents | 824b9d52e006 |
| children | db9a176190d3 |
line wrap: on
line diff
--- a/Objects/typeobject.c Sun Aug 26 05:33:45 2007 +0000 +++ b/Objects/typeobject.c Sun Aug 26 06:45:23 2007 +0000 @@ -44,6 +44,7 @@ type_set_name(PyTypeObject *type, PyObject *value, void *context) { PyHeapTypeObject* et; + char *tp_name; if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) { PyErr_Format(PyExc_TypeError, @@ -61,11 +62,10 @@ type->tp_name, Py_Type(value)->tp_name); return -1; } - value = _PyUnicode_AsDefaultEncodedString(value, NULL); - if (value == NULL) + tp_name = PyUnicode_AsString(value); + if (tp_name == NULL) return -1; - if (strlen(PyString_AS_STRING(value)) - != (size_t)PyString_GET_SIZE(value)) { + if (strlen(tp_name) != (size_t)PyUnicode_GET_SIZE(value)) { PyErr_Format(PyExc_ValueError, "__name__ must not contain null bytes"); return -1; @@ -78,7 +78,7 @@ Py_DECREF(et->ht_name); et->ht_name = value; - type->tp_name = PyString_AS_STRING(value); + type->tp_name = tp_name; return 0; } @@ -1736,7 +1736,7 @@ /* Have slots */ /* Make it into a tuple */ - if (PyString_Check(slots) || PyUnicode_Check(slots)) + if (PyUnicode_Check(slots)) slots = PyTuple_Pack(1, slots); else slots = PySequence_Tuple(slots); @@ -1875,14 +1875,10 @@ type->tp_as_sequence = &et->as_sequence; type->tp_as_mapping = &et->as_mapping; type->tp_as_buffer = &et->as_buffer; - if (PyString_Check(name)) - type->tp_name = PyString_AsString(name); - else { - type->tp_name = PyUnicode_AsString(name); - if (!type->tp_name) { - Py_DECREF(type); - return NULL; - } + type->tp_name = PyUnicode_AsString(name); + if (!type->tp_name) { + Py_DECREF(type); + return NULL; } /* Set tp_base and tp_bases */