Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bytes should never equal unicode. 

Add tests for str <cmpop> bytes.
This commit is contained in:
Guido van Rossum 2007-04-09 00:49:13 +00:00
parent 343e97ff7f
commit ebea9beab3
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Lib/test/test_bytes.py
View File

@ -114,6 +114,27 @@ def test_compare_to_str(self):
self.assertEqual(b"abc" < "ab", False)
self.assertEqual(b"abc" <= "ab", False)
self.assertEqual("abc" == b"abc", True)
self.assertEqual("ab" != b"abc", True)
self.assertEqual("ab" <= b"abc", True)
self.assertEqual("ab" < b"abc", True)
self.assertEqual("abc" >= b"ab", True)
self.assertEqual("abc" > b"ab", True)
self.assertEqual("abc" != b"abc", False)
self.assertEqual("ab" == b"abc", False)
self.assertEqual("ab" > b"abc", False)
self.assertEqual("ab" >= b"abc", False)
self.assertEqual("abc" < b"ab", False)
self.assertEqual("abc" <= b"ab", False)
# But they should never compare equal to Unicode!
# Test this for all expected byte orders and Unicode character sizes
self.assertEqual(b"\0a\0b\0c" == u"abc", False)
self.assertEqual(b"\0\0\0a\0\0\0b\0\0\0c" == u"abc", False)
self.assertEqual(b"a\0b\0c\0" == u"abc", False)
self.assertEqual(b"a\0\0\0b\0\0\0c\0\0\0" == u"abc", False)
def test_nohash(self):
self.assertRaises(TypeError, hash, bytes())

7
Objects/bytesobject.c
View File

@ -848,7 +848,12 @@ bytes_richcompare(PyObject *self, PyObject *other, int op)
int cmp;
/* For backwards compatibility, bytes can be compared to anything that
supports the (binary) buffer API. */
supports the (binary) buffer API. Except Unicode. */
if (PyUnicode_Check(self) || PyUnicode_Check(other)) {
Py_INCREF(Py_NotImplemented);
return Py_NotImplemented;
}
self_buffer = self->ob_type->tp_as_buffer;
if (self_buffer == NULL ||