diff options
| author | Guido van Rossum <guido@python.org> | 2007-10-16 18:12:55 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-10-16 18:12:55 (GMT) |
| commit | 3172c5d263eeffff1e89d03d79be3ccc1d60fbde (patch) | |
| tree | a35e103b36b684c4682ded57236199d6a0ecee4b /Objects/unicodeobject.c | |
| parent | 60d241f135f10312f5a638846659d7e471f6cac9 (diff) | |
| download | cpython-3172c5d263eeffff1e89d03d79be3ccc1d60fbde.zip cpython-3172c5d263eeffff1e89d03d79be3ccc1d60fbde.tar.gz cpython-3172c5d263eeffff1e89d03d79be3ccc1d60fbde.tar.bz2 | |
Patch# 1258 by Christian Heimes: kill basestring.
I like this because it makes the code shorter! :-)
Diffstat (limited to 'Objects/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index b2c24d7..fed2ff5 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -8441,7 +8441,7 @@ PyObject *PyUnicode_Format(PyObject *format, argidx = -2; } if (Py_Type(args)->tp_as_mapping && !PyTuple_Check(args) && - !PyObject_TypeCheck(args, &PyBaseString_Type)) + !PyString_Check(args) && !PyUnicode_Check(args)) dict = args; while (--fmtcnt >= 0) { @@ -8935,7 +8935,7 @@ PyTypeObject PyUnicode_Type = { unicode_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - &PyBaseString_Type, /* tp_base */ + &PyBaseObject_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ |