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

Patch #1049 by Thomas Lee. 

Changes comparisons between PyBytes and PyUnicode to return unequal
instead of raising TypeError.
This commit is contained in:
Guido van Rossum 2007-10-09 17:21:10 +00:00
parent 6ccd3f2dbc
commit 1e35e76532
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/test/test_bytes.py
View File

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

4
Objects/bytesobject.c
View File

@ -964,8 +964,8 @@ bytes_richcompare(PyObject *self, PyObject *other, int op)
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;
Py_INCREF(Py_NotImplemented);
return Py_NotImplemented;
}
self_size = _getbuffer(self, &self_bytes);