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

STINNER Victor (haypo)'s patch for bug 3988, Byte warning mode and b'' != '' 

Also, his patch to runtests.sh to pass the -bb option (issue 4125).
This commit is contained in:
Barry Warsaw 2008-10-17 01:50:37 +00:00
parent e94a37f3a1
commit 9e9dcd6d42
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/test/test_bytes.py
View File

@ -9,6 +9,7 @@ import os
import re
import sys
import copy
import operator
import pickle
import tempfile
import unittest
@ -863,6 +864,17 @@ class AssortedBytesTest(unittest.TestCase):
b = bytearray()
self.failIf(b.replace(b'', b'') is b)
def test_compare(self):
if sys.flags.bytes_warning:
warnings.simplefilter('error', BytesWarning)
self.assertRaises(BytesWarning, operator.eq, b'', '')
self.assertRaises(BytesWarning, operator.ne, b'', '')
self.assertRaises(BytesWarning, operator.eq, bytearray(b''), '')
self.assertRaises(BytesWarning, operator.ne, bytearray(b''), '')
else:
# raise test.support.TestSkipped("BytesWarning is needed for this test: use -bb option")
pass
# Optimizations:
# __iter__? (optimization)
# __reversed__? (optimization)

2
Objects/bytearrayobject.c
View File

@ -939,7 +939,7 @@ 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)) {
if (Py_BytesWarningFlag && op == Py_EQ) {
if (Py_BytesWarningFlag && (op == Py_EQ || op == Py_NE)) {
if (PyErr_WarnEx(PyExc_BytesWarning,
"Comparison between bytearray and string", 1))
return NULL;

2
Objects/bytesobject.c
View File

@ -818,7 +818,7 @@ string_richcompare(PyBytesObject *a, PyBytesObject *b, int op)
/* Make sure both arguments are strings. */
if (!(PyBytes_Check(a) && PyBytes_Check(b))) {
if (Py_BytesWarningFlag && (op == Py_EQ) &&
if (Py_BytesWarningFlag && (op == Py_EQ || op == Py_NE) &&
(PyObject_IsInstance((PyObject*)a,
(PyObject*)&PyUnicode_Type) ||
PyObject_IsInstance((PyObject*)b,