Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Make it an error to compare a bytes object and a Unicode object.

This commit is contained in:
Jeremy Hylton 2007-08-29 18:47:16 +00:00
parent 991bf5d8c8
commit 18c3ff887f
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/test/test_bytes.py
View File

@ -130,12 +130,12 @@ class BytesTest(unittest.TestCase):
self.assertEqual(str8("abc") < b"ab", False) self.assertEqual(str8("abc") < b"ab", False)
self.assertEqual(str8("abc") <= b"ab", False) self.assertEqual(str8("abc") <= b"ab", False)
# Bytes should never compare equal to Unicode! # Bytes can't be compared to Unicode!
# Test this for all expected byte orders and Unicode character sizes # Test this for all expected byte orders and Unicode character sizes
self.assertEqual(b"\0a\0b\0c" == "abc", False) self.assertRaises(TypeError, lambda: b"\0a\0b\0c" == "abc")
self.assertEqual(b"\0\0\0a\0\0\0b\0\0\0c" == "abc", False) self.assertRaises(TypeError, lambda: b"\0\0\0a\0\0\0b\0\0\0c" == "abc")
self.assertEqual(b"a\0b\0c\0" == "abc", False) self.assertRaises(TypeError, lambda: b"a\0b\0c\0" == "abc")
self.assertEqual(b"a\0\0\0b\0\0\0c\0\0\0" == "abc", False) self.assertRaises(TypeError, lambda: b"a\0\0\0b\0\0\0c\0\0\0" == "abc")
def test_nohash(self): def test_nohash(self):
self.assertRaises(TypeError, hash, bytes()) self.assertRaises(TypeError, hash, bytes())

10
Objects/bytesobject.c
View File

@ -959,8 +959,14 @@ bytes_richcompare(PyObject *self, PyObject *other, int op)
Py_ssize_t minsize; Py_ssize_t minsize;
int cmp; int cmp;
/* Bytes can be compared to anything that supports the (binary) buffer /* Bytes can be compared to anything that supports the (binary)
API. Except Unicode. */ buffer API. Except that a comparison with Unicode is always an
error, even if the comparison is for equality. */
if (PyObject_IsInstance(self, (PyObject*)&PyUnicode_Type) ||
PyObject_IsInstance(other, (PyObject*)&PyUnicode_Type)) {
PyErr_SetString(PyExc_TypeError, "can't compare bytes and str");
return NULL;
}
self_size = _getbuffer(self, &self_bytes); self_size = _getbuffer(self, &self_bytes);
if (self_size < 0) { if (self_size < 0) {