diff options
| author | Guido van Rossum <guido@python.org> | 2007-04-13 02:23:57 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-04-13 02:23:57 +0000 |
| commit | 84d79ddce2176ae54825da32e096d6332a8d5138 (patch) | |
| tree | 17236790cda0f1ba7d0eda07a8112f9d717c9418 | |
| parent | ad7d8d10b70b62b25fc8ebd1a6bfef0c008a232a (diff) | |
| download | cpython-git-84d79ddce2176ae54825da32e096d6332a8d5138.tar.gz | |
Disallow u"..." + b"..." and b"..." + u"...".
| -rw-r--r-- | Lib/test/test_bytes.py | 2 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py index 1d826b6380..999346f3b1 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -374,7 +374,7 @@ class BytesTest(unittest.TestCase): self.assertEqual(b1 + "def", bytes("abcdef")) self.assertEqual("def" + b1, bytes("defabc")) self.assertRaises(TypeError, lambda: b1 + u"def") - ##self.assertRaises(TypeError, lambda: u"abc" + b2) # XXX FIXME + self.assertRaises(TypeError, lambda: u"abc" + b2) def test_repeat(self): b = bytes("abc") diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 4fe4d10031..ce28692d7b 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) |