diff options
Diffstat (limited to 'Python/sysmodule.c')
| -rw-r--r-- | Python/sysmodule.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 17568349d5..a8bb918f5a 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -266,14 +266,21 @@ sys_intern(PyObject *self, PyObject *args) PyObject *s; if (!PyArg_ParseTuple(args, "S:intern", &s)) return NULL; - if (!PyString_CheckExact(s)) { - PyErr_SetString(PyExc_TypeError, - "can't intern subclass of string"); + if (PyString_CheckExact(s)) { + Py_INCREF(s); + PyString_InternInPlace(&s); + return s; + } + else if (PyUnicode_CheckExact(s)) { + Py_INCREF(s); + PyUnicode_InternInPlace(&s); + return s; + } + else { + PyErr_Format(PyExc_TypeError, + "can't intern %.400s", s->ob_type->tp_name); return NULL; } - Py_INCREF(s); - PyString_InternInPlace(&s); - return s; } PyDoc_STRVAR(intern_doc, |