mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

For Make Benefit Glorious Nation of Backwards Compatibility,

Browse source 
bytes objects can now be compared to anything that supports the buffer API.
This commit is contained in:
Guido van Rossum 2007-04-09 00:43:24 +00:00
parent 62cbc8a261
commit 343e97ff7f
2 changed files with 48 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Lib/test/test_bytes.py
View file

@ -99,6 +99,21 @@ class BytesTest(unittest.TestCase):
self.failIf(b3 < b2) self.failIf(b3 < b2)
self.failIf(b3 <= b2) self.failIf(b3 <= b2)
def test_compare_to_str(self):
self.assertEqual(b"abc" == "abc", True)
self.assertEqual(b"ab" != "abc", True)
self.assertEqual(b"ab" <= "abc", True)
self.assertEqual(b"ab" < "abc", True)
self.assertEqual(b"abc" >= "ab", True)
self.assertEqual(b"abc" > "ab", True)
self.assertEqual(b"abc" != "abc", False)
self.assertEqual(b"ab" == "abc", False)
self.assertEqual(b"ab" > "abc", False)
self.assertEqual(b"ab" >= "abc", False)
self.assertEqual(b"abc" < "ab", False)
self.assertEqual(b"abc" <= "ab", False)
def test_nohash(self): def test_nohash(self):
self.assertRaises(TypeError, hash, bytes()) self.assertRaises(TypeError, hash, bytes())

43
Objects/bytesobject.c
View file

@ -838,33 +838,56 @@ bytes_str(PyBytesObject *self)
} }
static PyObject * static PyObject *
bytes_richcompare(PyBytesObject *self, PyBytesObject *other, int op) bytes_richcompare(PyObject *self, PyObject *other, int op)
{ {
PyBufferProcs *self_buffer, *other_buffer;
Py_ssize_t self_size, other_size;
void *self_bytes, *other_bytes;
PyObject *res; PyObject *res;
int minsize; Py_ssize_t minsize;
int cmp; int cmp;
if (!PyBytes_Check(self) || !PyBytes_Check(other)) { /* For backwards compatibility, bytes can be compared to anything that
supports the (binary) buffer API. */
self_buffer = self->ob_type->tp_as_buffer;
if (self_buffer == NULL ||
self_buffer->bf_getreadbuffer == NULL ||
self_buffer->bf_getsegcount == NULL ||
self_buffer->bf_getsegcount(self, NULL) != 1)
{
Py_INCREF(Py_NotImplemented); Py_INCREF(Py_NotImplemented);
return Py_NotImplemented; return Py_NotImplemented;
} }
self_size = self_buffer->bf_getreadbuffer(self, 0, &self_bytes);
if (self->ob_size != other->ob_size && (op == Py_EQ || op == Py_NE)) { other_buffer = other->ob_type->tp_as_buffer;
if (other_buffer == NULL ||
other_buffer->bf_getreadbuffer == NULL ||
other_buffer->bf_getsegcount == NULL ||
other_buffer->bf_getsegcount(self, NULL) != 1)
{
Py_INCREF(Py_NotImplemented);
return Py_NotImplemented;
}
other_size = other_buffer->bf_getreadbuffer(other, 0, &other_bytes);
if (self_size != other_size && (op == Py_EQ || op == Py_NE)) {
/* Shortcut: if the lengths differ, the objects differ */ /* Shortcut: if the lengths differ, the objects differ */
cmp = (op == Py_NE); cmp = (op == Py_NE);
} }
else { else {
minsize = self->ob_size; minsize = self_size;
if (other->ob_size < minsize) if (other_size < minsize)
minsize = other->ob_size; minsize = other_size;
cmp = memcmp(self->ob_bytes, other->ob_bytes, minsize); cmp = memcmp(self_bytes, other_bytes, minsize);
/* In ISO C, memcmp() guarantees to use unsigned bytes! */ /* In ISO C, memcmp() guarantees to use unsigned bytes! */
if (cmp == 0) { if (cmp == 0) {
if (self->ob_size < other->ob_size) if (self_size < other_size)
cmp = -1; cmp = -1;
else if (self->ob_size > other->ob_size) else if (self_size > other_size)
cmp = 1; cmp = 1;
} }