Raise NotImplementedError

JelleZijlstra · JelleZijlstra · commit 1a63f5d2582d · 2024-05-22T05:29:05.000-07:00
diff --git a/Lib/test/test_type_annotations.py b/Lib/test/test_type_annotations.py
@@ -315,7 +315,7 @@ class X:
     def test_module(self):
         ns = run_code("x: undefined = 1")
         anno = ns["__annotate__"]
-        with self.assertRaises(AssertionError):  # TODO NotImplementedError
+        with self.assertRaises(NotImplementedError):
             anno(2)
 
         with self.assertRaises(NameError):
@@ -350,8 +350,8 @@ class X:
                 annotate = obj.__annotate__
                 self.assertIsInstance(annotate, types.FunctionType)
                 self.assertEqual(annotate.__name__, f"<annotations of {obj.__name__}>")
-                with self.assertRaises(AssertionError):  # TODO NotImplementedError
+                with self.assertRaises(NotImplementedError):
                     annotate(inspect.FORWARDREF)
-                with self.assertRaises(AssertionError):  # TODO NotImplementedError
+                with self.assertRaises(NotImplementedError):
                     annotate(None)
                 self.assertEqual(annotate(inspect.VALUE), {"x": int})
diff --git a/Python/compile.c b/Python/compile.c
@@ -1658,7 +1658,7 @@ compiler_leave_annotations_scope(struct compiler *c, location loc,
     ADDOP_I(c, loc, BUILD_MAP, annotations_len);
     ADDOP_IN_SCOPE(c, loc, RETURN_VALUE);
     USE_LABEL(c, label);
-    ADDOP_IN_SCOPE(c, loc, LOAD_ASSERTION_ERROR);
+    ADDOP_I(c, loc, LOAD_COMMON_CONSTANT, CONSTANT_NOTIMPLEMENTEDERROR);
     ADDOP_I(c, loc, RAISE_VARARGS, 1);
     PyCodeObject *co = optimize_and_assemble(c, 1);
     compiler_exit_scope(c);
