diff options
| author | Neil Schemenauer <nascheme@enme.ucalgary.ca> | 2002-11-18 16:10:18 (GMT) |
|---|---|---|
| committer | Neil Schemenauer <nascheme@enme.ucalgary.ca> | 2002-11-18 16:10:18 (GMT) |
| commit | ce30bc9f49dd77a9e6707eabaa1f3ceb8e6e458e (patch) | |
| tree | 0928b8dd8215d4768baba0d4f3d671252f0a4cf9 | |
| parent | a6cd4e65d7faef4928f86ad728c32dcf24b80fb5 (diff) | |
| download | cpython-ce30bc9f49dd77a9e6707eabaa1f3ceb8e6e458e.zip cpython-ce30bc9f49dd77a9e6707eabaa1f3ceb8e6e458e.tar.gz cpython-ce30bc9f49dd77a9e6707eabaa1f3ceb8e6e458e.tar.bz2 | |
Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506.
| -rw-r--r-- | Objects/unicodeobject.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 12846bf..8565fb1 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -5799,6 +5799,24 @@ static PyMethodDef unicode_methods[] = { {NULL, NULL} }; +static PyObject * +unicode_mod(PyObject *v, PyObject *w) +{ + if (!PyUnicode_Check(v)) { + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; + } + return PyUnicode_Format(v, w); +} + +static PyNumberMethods unicode_as_number = { + 0, /*nb_add*/ + 0, /*nb_subtract*/ + 0, /*nb_multiply*/ + 0, /*nb_divide*/ + unicode_mod, /*nb_remainder*/ +}; + static PySequenceMethods unicode_as_sequence = { (inquiry) unicode_length, /* sq_length */ (binaryfunc) PyUnicode_Concat, /* sq_concat */ @@ -6647,7 +6665,7 @@ PyTypeObject PyUnicode_Type = { 0, /* tp_setattr */ (cmpfunc) unicode_compare, /* tp_compare */ (reprfunc) unicode_repr, /* tp_repr */ - 0, /* tp_as_number */ + &unicode_as_number, /* tp_as_number */ &unicode_as_sequence, /* tp_as_sequence */ &unicode_as_mapping, /* tp_as_mapping */ (hashfunc) unicode_hash, /* tp_hash*/ @@ -6656,7 +6674,8 @@ PyTypeObject PyUnicode_Type = { PyObject_GenericGetAttr, /* tp_getattro */ 0, /* tp_setattro */ &unicode_as_buffer, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_CHECKTYPES | + Py_TPFLAGS_BASETYPE, /* tp_flags */ unicode_doc, /* tp_doc */ 0, /* tp_traverse */ 0, /* tp_clear */ |