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 /Python | |
| 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 'Python')
| -rw-r--r-- | Python/bltinmodule.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 338c424..70f1170 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -1595,12 +1595,19 @@ builtin_sum(PyObject *self, PyObject *args) } } else { /* reject string values for 'start' parameter */ - if (PyObject_TypeCheck(result, &PyBaseString_Type)) { + if (PyUnicode_Check(result)) { PyErr_SetString(PyExc_TypeError, "sum() can't sum strings [use ''.join(seq) instead]"); Py_DECREF(iter); return NULL; } + if (PyBytes_Check(result)) { + PyErr_SetString(PyExc_TypeError, + "sum() can't sum bytes [use b''.join(seq) instead]"); + Py_DECREF(iter); + return NULL; + } + Py_INCREF(result); } @@ -1788,7 +1795,6 @@ _PyBuiltin_Init(void) SETBUILTIN("NotImplemented", Py_NotImplemented); SETBUILTIN("False", Py_False); SETBUILTIN("True", Py_True); - SETBUILTIN("basestring", &PyBaseString_Type); SETBUILTIN("bool", &PyBool_Type); SETBUILTIN("memoryview", &PyMemoryView_Type); SETBUILTIN("bytes", &PyBytes_Type); |