gh-113570: reprlib.repr does not use builtin __repr__ for reshadowed builtins

Lib/reprlib.py

@@ -60,12 +60,26 @@ def repr(self, x):
         return self.repr1(x, self.maxlevel)
 
     def repr1(self, x, level):
-        typename = type(x).__name__
-        if ' ' in typename:
-            parts = typename.split()
-            typename = '_'.join(parts)
-        if hasattr(self, 'repr_' + typename):
-            return getattr(self, 'repr_' + typename)(x, level)
+
+        _lookup = {
+            ("builtins", "tuple"): self.repr_tuple,
+            ("builtins", "list"): self.repr_list,
+            ("array", "array"): self.repr_array,
+            ("builtins", "set"): self.repr_set,
+            ("builtins", "frozenset"): self.repr_frozenset,
+            ("collections", "deque"): self.repr_deque,
+            ("builtins", "dict"): self.repr_dict,
+            ("builtins", "str"): self.repr_str,
+            ("builtins", "int"): self.repr_int,
+        }
+
+        _type = type(x)
+        module = _type.__module__
+        typename = _type.__name__
+
+        predefined_repr = _lookup.get((module, typename))
+        if predefined_repr:
+            return predefined_repr(x, level)
         else:
             return self.repr_instance(x, level)
 

Lib/test/test_reprlib.py

@@ -580,6 +580,16 @@ def test_invalid_indent(self):
                 with self.assertRaisesRegex(expected_error, expected_msg):
                     r.repr(test_object)
 
+    def test_shadowed_builtin(self):
+        # Issue #113570: repr() should not be fooled by a shadowed builtin
+        # function
+        class array:
+            def __repr__(self):
+                return "not array.array"
+
+        self.assertEqual(r(array()), "not array.array")
+
+
 def write_file(path, text):
     with open(path, 'w', encoding='ASCII') as fp:
         fp.write(text)

Misc/NEWS.d/next/Core and Builtins/2023-12-30-00-21-45.gh-issue-113570._XQgsW.rst

@@ -0,0 +1 @@
+Fixed a bug in ``reprlib.repr`` where it incorrectly called the repr method on shadowed Python built-in types.