Issue python#27474: Unified error messages in the __contains__ method of bytes and

serhiy-storchaka · serhiy-storchaka · commit f9efb8b18b68 · 2016-07-10T12:37:30.000+03:00
bytearray for integers in and out of the Py_ssize_t range.
Patch by Xiang Zhang.
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
@@ -269,6 +269,7 @@ def test_contains(self):
         self.assertNotIn(200, b)
         self.assertRaises(ValueError, lambda: 300 in b)
         self.assertRaises(ValueError, lambda: -1 in b)
+        self.assertRaises(ValueError, lambda: sys.maxsize+1 in b)
         self.assertRaises(TypeError, lambda: None in b)
         self.assertRaises(TypeError, lambda: float(ord('a')) in b)
         self.assertRaises(TypeError, lambda: "a" in b)
diff --git a/Objects/bytes_methods.c b/Objects/bytes_methods.c
@@ -645,7 +645,7 @@ _Py_bytes_count(const char *str, Py_ssize_t len, PyObject *args)
 int
 _Py_bytes_contains(const char *str, Py_ssize_t len, PyObject *arg)
 {
-    Py_ssize_t ival = PyNumber_AsSsize_t(arg, PyExc_ValueError);
+    Py_ssize_t ival = PyNumber_AsSsize_t(arg, NULL);
     if (ival == -1 && PyErr_Occurred()) {
         Py_buffer varg;
         Py_ssize_t pos;

Original file line number	Diff line number	Diff line change
`@@ -645,7 +645,7 @@ _Py_bytes_count(const char str, Py_ssize_t len, PyObject args)`
`645`	`645`	`int`
`646`	`646`	`_Py_bytes_contains(const char str, Py_ssize_t len, PyObject arg)`
`647`	`647`	`{`
`648`		`- Py_ssize_t ival = PyNumber_AsSsize_t(arg, PyExc_ValueError);`
	`648`	`+ Py_ssize_t ival = PyNumber_AsSsize_t(arg, NULL);`
`649`	`649`	`if (ival == -1 && PyErr_Occurred()) {`
`650`	`650`	`Py_buffer varg;`
`651`	`651`	`Py_ssize_t pos;`