move tests, edit rst wording

Author: ynir3

Doc/whatsnew/3.15.rst

@@ -200,8 +200,9 @@ Other language changes
 * Several error messages incorrectly using the term "argument" have been corrected.
   (Contributed by Stan Ulbrych in :gh:`133382`.)
 
-* The :meth:`repr` of :class:`ImportError` and :class:`ModuleNotFoundError` now
-  contains attributes name and path.
+* The :meth:`~object.__repr__` of :class:`ImportError` and :class:`ModuleNotFoundError`
+  now shows "name" and "path" as ``name=<name>`` and ``path=<path>`` if they were given
+  as keyword arguments at construction time.
   (Contributed by Serhiy Storchaka, Oleg Iarygin, and Yoav Nir in :gh:`74185`.)
 
 

Lib/test/test_exceptions.py

@@ -2079,6 +2079,50 @@ def test_copy_pickle(self):
                 self.assertEqual(exc.name, orig.name)
                 self.assertEqual(exc.path, orig.path)
 
+    def test_repr(self):
+        exc = ImportError()
+        self.assertEqual(repr(exc), "ImportError()")
+
+        exc = ImportError('test')
+        self.assertEqual(repr(exc), "ImportError('test')")
+
+        exc = ImportError('test', 'case')
+        self.assertEqual(repr(exc), "ImportError('test', 'case')")
+
+        exc = ImportError(name='somemodule')
+        self.assertEqual(repr(exc), "ImportError(name='somemodule')")
+
+        exc = ImportError('test', name='somemodule')
+        self.assertEqual(repr(exc), "ImportError('test', name='somemodule')")
+
+        exc = ImportError(path='somepath')
+        self.assertEqual(repr(exc), "ImportError(path='somepath')")
+
+        exc = ImportError('test', path='somepath')
+        self.assertEqual(repr(exc), "ImportError('test', path='somepath')")
+
+        exc = ImportError(name='somename', path='somepath')
+        self.assertEqual(repr(exc),
+                "ImportError(name='somename', path='somepath')")
+
+        exc = ImportError('test', name='somename', path='somepath')
+        self.assertEqual(repr(exc),
+                "ImportError('test', name='somename', path='somepath')")
+
+        exc = ModuleNotFoundError('test', name='somename', path='somepath')
+        self.assertEqual(repr(exc),
+                "ModuleNotFoundError('test', name='somename', path='somepath')")
+
+    def test_ModuleNotFoundError_repr_with_failed_import(self):
+        with self.assertRaises(ModuleNotFoundError) as cm:
+            import does_not_exist  # type: ignore[import] # noqa: F401
+
+        self.assertEqual(cm.exception.name, "does_not_exist")
+        self.assertIsNone(cm.exception.path)
+
+        self.assertEqual(repr(cm.exception),
+            "ModuleNotFoundError(\"No module named 'does_not_exist'\", name='does_not_exist')")
+
 
 def run_script(source):
     if isinstance(source, str):
@@ -2596,50 +2640,5 @@ def after_with():
                 1/0
         self.lineno_after_raise(after_with, 1, 1)
 
-    def test_repr(self):
-        exc = ImportError()
-        self.assertEqual(repr(exc), "ImportError()")
-
-        exc = ImportError('test')
-        self.assertEqual(repr(exc), "ImportError('test')")
-
-        exc = ImportError('test', 'case')
-        self.assertEqual(repr(exc), "ImportError('test', 'case')")
-
-        exc = ImportError(name='somemodule')
-        self.assertEqual(repr(exc), "ImportError(name='somemodule')")
-
-        exc = ImportError('test', name='somemodule')
-        self.assertEqual(repr(exc), "ImportError('test', name='somemodule')")
-
-        exc = ImportError(path='somepath')
-        self.assertEqual(repr(exc), "ImportError(path='somepath')")
-
-        exc = ImportError('test', path='somepath')
-        self.assertEqual(repr(exc), "ImportError('test', path='somepath')")
-
-        exc = ImportError(name='somename', path='somepath')
-        self.assertEqual(repr(exc),
-                "ImportError(name='somename', path='somepath')")
-
-        exc = ImportError('test', name='somename', path='somepath')
-        self.assertEqual(repr(exc),
-                "ImportError('test', name='somename', path='somepath')")
-
-        exc = ModuleNotFoundError('test', name='somename', path='somepath')
-        self.assertEqual(repr(exc),
-                "ModuleNotFoundError('test', name='somename', path='somepath')")
-
-    def test_ModuleNotFoundError_repr_with_failed_import(self):
-        with self.assertRaises(ModuleNotFoundError) as cm:
-            import does_not_exist  # type: ignore[import] # noqa: F401
-
-        self.assertEqual(cm.exception.name, "does_not_exist")
-        self.assertIsNone(cm.exception.path)
-
-        self.assertEqual(repr(cm.exception),
-            "ModuleNotFoundError(\"No module named 'does_not_exist'\", name='does_not_exist')")
-
-
 if __name__ == '__main__':
     unittest.main()

Misc/NEWS.d/next/Core_and_Builtins/2025-07-19-10-35-31.gh-issue-74185.7hPCA5.rst

@@ -1,3 +1,4 @@
-The :meth:`repr` of :class:`ImportError` and :class:`ModuleNotFoundError` now
-contains attributes name and path.
-Patch by Serhiy Storchaka, Oleg Iarygin, and Yoav Nir
+The :meth:`~object.__repr__` of :class:`ImportError` and :class:`ModuleNotFoundError`
+now shows "name" and "path" as ``name=<name>`` and ``path=<path>`` if they were given
+as keyword arguments at construction time.
+(Contributed by Serhiy Storchaka, Oleg Iarygin, and Yoav Nir in :gh:`74185`.)