diff options
| author | Guido van Rossum <guido@python.org> | 2007-04-13 02:23:57 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-04-13 02:23:57 (GMT) |
| commit | 84d79ddce2176ae54825da32e096d6332a8d5138 (patch) | |
| tree | 17236790cda0f1ba7d0eda07a8112f9d717c9418 /Objects/unicodeobject.c | |
| parent | ad7d8d10b70b62b25fc8ebd1a6bfef0c008a232a (diff) | |
| download | cpython-84d79ddce2176ae54825da32e096d6332a8d5138.zip cpython-84d79ddce2176ae54825da32e096d6332a8d5138.tar.gz cpython-84d79ddce2176ae54825da32e096d6332a8d5138.tar.bz2 | |
Disallow u"..." + b"..." and b"..." + u"...".
Diffstat (limited to 'Objects/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 4fe4d10..ce28692 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -5535,6 +5535,9 @@ PyObject *PyUnicode_Concat(PyObject *left, { PyUnicodeObject *u = NULL, *v = NULL, *w; + if (PyBytes_Check(left) || PyBytes_Check(right)) + return PyBytes_Concat(left, right); + /* Coerce the two arguments */ u = (PyUnicodeObject *)PyUnicode_FromObject(left); if (u == NULL) |