bpo-40736: Improve the error message for re.search() TypeError (pytho…

…nGH-23312) Include the invalid type in the error message.
neilmock · May 21, 2021 · 6cc8ac9 · 6cc8ac9
1 parent 498383c
commit 6cc8ac9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
@@ -2104,6 +2104,12 @@ def test_bug_34294(self):
                           {'tag': 'foo', 'text': None},
                           {'tag': 'foo', 'text': None}])
 
+    def test_bug_40736(self):
+        with self.assertRaisesRegex(TypeError, "got 'int'"):
+            re.search("x*", 5)
+        with self.assertRaisesRegex(TypeError, "got 'type'"):
+            re.search("x*", type)
+
 
 class PatternReprTests(unittest.TestCase):
     def check(self, pattern, expected):

diff --git a/Modules/_sre.c b/Modules/_sre.c
@@ -389,7 +389,8 @@ getstring(PyObject* string, Py_ssize_t* p_length,
 
     /* get pointer to byte string buffer */
     if (PyObject_GetBuffer(string, view, PyBUF_SIMPLE) != 0) {
-        PyErr_SetString(PyExc_TypeError, "expected string or bytes-like object");
+        PyErr_Format(PyExc_TypeError, "expected string or bytes-like "
+                     "object, got '%.200s'", Py_TYPE(string)->tp_name);
         return NULL;
     }