summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-04-09 00:49:13 (GMT)
committerGuido van Rossum <guido@python.org>2007-04-09 00:49:13 (GMT)
commitebea9beab34d9c7552764c071b0d7fdb4744092b (patch)
tree2a5027f9ab3b229a97a65f57c162a6ba9e5c03ea /Objects
parent343e97ff7f939fc16d144a196a95ecf2e82c061e (diff)
downloadcpython-ebea9beab34d9c7552764c071b0d7fdb4744092b.zip
cpython-ebea9beab34d9c7552764c071b0d7fdb4744092b.tar.gz
cpython-ebea9beab34d9c7552764c071b0d7fdb4744092b.tar.bz2
Bytes should never equal unicode.
Add tests for str <cmpop> bytes.
Diffstat (limited to 'Objects')
-rw-r--r--Objects/bytesobject.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 34f381a..d985fc7 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -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 ||