NameError new attribute op

Author: Locked-chess-official

Include/cpython/pyerrors.h

@@ -75,6 +75,7 @@ typedef struct {
 typedef struct {
     PyException_HEAD
     PyObject *name;
+    PyObject *op;
 } PyNameErrorObject;
 
 typedef struct {

Include/internal/pycore_ceval.h

@@ -293,8 +293,8 @@ PyAPI_FUNC(int) _PyEval_CheckExceptStarTypeValid(PyThreadState *tstate, PyObject
 PyAPI_FUNC(int) _PyEval_CheckExceptTypeValid(PyThreadState *tstate, PyObject* right);
 PyAPI_FUNC(int) _PyEval_ExceptionGroupMatch(_PyInterpreterFrame *, PyObject* exc_value, PyObject *match_type, PyObject **match, PyObject **rest);
 PyAPI_FUNC(void) _PyEval_FormatAwaitableError(PyThreadState *tstate, PyTypeObject *type, int oparg);
-PyAPI_FUNC(void) _PyEval_FormatExcCheckArg(PyThreadState *tstate, PyObject *exc, const char *format_str, PyObject *obj);
-PyAPI_FUNC(void) _PyEval_FormatExcUnbound(PyThreadState *tstate, PyCodeObject *co, int oparg);
+PyAPI_FUNC(void) _PyEval_FormatExcCheckArg(PyThreadState *tstate, PyObject *exc, const char *format_str, PyObject *obj, PyObject* op);
+PyAPI_FUNC(void) _PyEval_FormatExcUnbound(PyThreadState *tstate, PyCodeObject *co, int oparg, int op_type);
 PyAPI_FUNC(void) _PyEval_FormatKwargsError(PyThreadState *tstate, PyObject *func, PyObject *kwargs);
 PyAPI_FUNC(PyObject *) _PyEval_ImportFrom(PyThreadState *, PyObject *, PyObject *);
 PyAPI_FUNC(PyObject *) _PyEval_ImportName(PyThreadState *, _PyInterpreterFrame *, PyObject *, PyObject *, PyObject *);

Lib/test/test_traceback.py

@@ -4648,6 +4648,19 @@ def func():
         actual = self.get_suggestion(func)
         self.assertIn("'ZeroDivisionError'?", actual)
 
+    def test_name_error_ignore_suggestions_from_builtins_in_deleting(self):
+        try:
+            exec("del next")
+        except NameError:
+            msg = traceback.format_exc()
+            self.assertNotIn("anext", msg)
+
+        def func():
+            del next
+
+        actual = self.get_suggestion(func)
+        self.assertNotIn("anext", actual)
+
     def test_name_error_suggestions_with_non_string_candidates(self):
         def func():
             abc = 1

Lib/traceback.py

@@ -1674,11 +1674,15 @@ def _compute_suggestion_error(exc_value, tb, wrong_name):
         while tb.tb_next is not None:
             tb = tb.tb_next
         frame = tb.tb_frame
-        d = (
-            list(frame.f_locals)
-            + list(frame.f_globals)
-            + list(frame.f_builtins)
-        )
+        if getattr(exc_value, "op", "getting") == "deleting":
+            d = (list(frame.f_locals)
+                + list(frame.f_globals))
+        else:
+            d = (
+                list(frame.f_locals)
+                + list(frame.f_globals)
+                + list(frame.f_builtins)
+            )
         d = [x for x in d if isinstance(x, str)]
 
         # Check first if we are in a method and the instance

Objects/exceptions.c

@@ -2506,8 +2506,9 @@ PyNameErrorObject_CAST(PyObject *self)
 static int
 NameError_init(PyObject *op, PyObject *args, PyObject *kwds)
 {
-    static char *kwlist[] = {"name", NULL};
+    static char *kwlist[] = {"name", "op", NULL};
     PyObject *name = NULL;
+    PyObject* op_type = NULL;
 
     if (BaseException_init(op, args, NULL) == -1) {
         return -1;
@@ -2518,14 +2519,15 @@ NameError_init(PyObject *op, PyObject *args, PyObject *kwds)
         return -1;
     }
     if (!PyArg_ParseTupleAndKeywords(empty_tuple, kwds, "|$O:NameError", kwlist,
-                                     &name)) {
+                                     &name ,&op_type)) {
         Py_DECREF(empty_tuple);
         return -1;
     }
     Py_DECREF(empty_tuple);
 
     PyNameErrorObject *self = PyNameErrorObject_CAST(op);
     Py_XSETREF(self->name, Py_XNewRef(name));
+    Py_XSETREF(self->op, Py_XNewRef(op_type));
 
     return 0;
 }
@@ -2535,6 +2537,7 @@ NameError_clear(PyObject *op)
 {
     PyNameErrorObject *self = PyNameErrorObject_CAST(op);
     Py_CLEAR(self->name);
+    Py_CLEAR(self->op);
     return BaseException_clear(op);
 }
 
@@ -2551,11 +2554,14 @@ NameError_traverse(PyObject *op, visitproc visit, void *arg)
 {
     PyNameErrorObject *self = PyNameErrorObject_CAST(op);
     Py_VISIT(self->name);
+    Py_VISIT(self->op);
     return BaseException_traverse(op, visit, arg);
 }
 
 static PyMemberDef NameError_members[] = {
         {"name", _Py_T_OBJECT, offsetof(PyNameErrorObject, name), 0, PyDoc_STR("name")},
+        {"op", _Py_T_OBJECT, offsetof(PyNameErrorObject, op), 0,
+        PyDoc_STR("operation that caused the NameError ('getting' or 'deleting')")},
         {NULL}  /* Sentinel */
 };
 

Python/bytecodes.c

@@ -1917,7 +1917,7 @@ dummy_func(
             // Fortunately we don't need its superpower.
             PyObject *oldobj = PyCell_SwapTakeRef((PyCellObject *)cell, NULL);
             if (oldobj == NULL) {
-                _PyEval_FormatExcUnbound(tstate, _PyFrame_GetCode(frame), oparg);
+                _PyEval_FormatExcUnbound(tstate, _PyFrame_GetCode(frame), oparg, 1);
                 ERROR_NO_POP();
             }
             Py_DECREF(oldobj);
@@ -1939,7 +1939,7 @@ dummy_func(
                 PyCellObject *cell = (PyCellObject *)PyStackRef_AsPyObjectBorrow(GETLOCAL(oparg));
                 value_o = PyCell_GetRef(cell);
                 if (value_o == NULL) {
-                    _PyEval_FormatExcUnbound(tstate, _PyFrame_GetCode(frame), oparg);
+                    _PyEval_FormatExcUnbound(tstate, _PyFrame_GetCode(frame), oparg, 0);
                     ERROR_NO_POP();
                 }
             }
@@ -1951,7 +1951,7 @@ dummy_func(
             PyCellObject *cell = (PyCellObject *)PyStackRef_AsPyObjectBorrow(GETLOCAL(oparg));
             value = _PyCell_GetStackRef(cell);
             if (PyStackRef_IsNull(value)) {
-                _PyEval_FormatExcUnbound(tstate, _PyFrame_GetCode(frame), oparg);
+                _PyEval_FormatExcUnbound(tstate, _PyFrame_GetCode(frame), oparg, 0);
                 ERROR_IF(true);
             }
         }

Python/ceval.c

@@ -3320,7 +3320,7 @@ _PyEval_FormatKwargsError(PyThreadState *tstate, PyObject *func, PyObject *kwarg
 
 void
 _PyEval_FormatExcCheckArg(PyThreadState *tstate, PyObject *exc,
-                          const char *format_str, PyObject *obj)
+                          const char *format_str, PyObject *obj, PyObject *op)
 {
     const char *obj_str;
 
@@ -3342,25 +3342,35 @@ _PyEval_FormatExcCheckArg(PyThreadState *tstate, PyObject *exc,
                 // NameError anyway.
                 (void)PyObject_SetAttr(exc, &_Py_ID(name), obj);
             }
+            if (((PyNameErrorObject*)exc)->op == NULL) {
+                (void)PyObject_SetAttrString(exc, "op", op);
+            }
         }
         PyErr_SetRaisedException(exc);
     }
 }
 
 void
-_PyEval_FormatExcUnbound(PyThreadState *tstate, PyCodeObject *co, int oparg)
+_PyEval_FormatExcUnbound(PyThreadState *tstate, PyCodeObject *co, int oparg, int op_type)
 {
     PyObject *name;
+    PyObject* op;
+    if (op_type == 0) {
+        op = PyUnicode_FromString("getting");
+    }
+    else {
+        op = PyUnicode_FromString("deleting");
+    }
     /* Don't stomp existing exception */
     if (_PyErr_Occurred(tstate))
         return;
     name = PyTuple_GET_ITEM(co->co_localsplusnames, oparg);
     if (oparg < PyUnstable_Code_GetFirstFree(co)) {
         _PyEval_FormatExcCheckArg(tstate, PyExc_UnboundLocalError,
-                                  UNBOUNDLOCAL_ERROR_MSG, name);
+                                  UNBOUNDLOCAL_ERROR_MSG, name, op);
     } else {
         _PyEval_FormatExcCheckArg(tstate, PyExc_NameError,
-                                  UNBOUNDFREE_ERROR_MSG, name);
+                                  UNBOUNDFREE_ERROR_MSG, name, op);
     }
 }
 
@@ -3453,6 +3463,7 @@ _PyEval_GetANext(PyObject *aiter)
 void
 _PyEval_LoadGlobalStackRef(PyObject *globals, PyObject *builtins, PyObject *name, _PyStackRef *writeto)
 {
+    PyObject* op = PyUnicode_FromString("getting");
     if (PyDict_CheckExact(globals) && PyDict_CheckExact(builtins)) {
         _PyDict_LoadGlobalStackRef((PyDictObject *)globals,
                                     (PyDictObject *)builtins,
@@ -3461,7 +3472,7 @@ _PyEval_LoadGlobalStackRef(PyObject *globals, PyObject *builtins, PyObject *name
             /* _PyDict_LoadGlobal() returns NULL without raising
                 * an exception if the key doesn't exist */
             _PyEval_FormatExcCheckArg(PyThreadState_GET(), PyExc_NameError,
-                                        NAME_ERROR_MSG, name);
+                                        NAME_ERROR_MSG, name, op);
         }
     }
     else {
@@ -3481,7 +3492,7 @@ _PyEval_LoadGlobalStackRef(PyObject *globals, PyObject *builtins, PyObject *name
             if (res == NULL) {
                 _PyEval_FormatExcCheckArg(
                             PyThreadState_GET(), PyExc_NameError,
-                            NAME_ERROR_MSG, name);
+                            NAME_ERROR_MSG, name, op);
                 *writeto = PyStackRef_NULL;
                 return;
             }
@@ -3519,6 +3530,7 @@ _PyEval_LoadName(PyThreadState *tstate, _PyInterpreterFrame *frame, PyObject *na
 {
 
     PyObject *value;
+    PyObject* op = PyUnicode_FromString("getting");
     if (frame->f_locals == NULL) {
         _PyErr_SetString(tstate, PyExc_SystemError,
                             "no locals found");
@@ -3542,7 +3554,7 @@ _PyEval_LoadName(PyThreadState *tstate, _PyInterpreterFrame *frame, PyObject *na
     if (value == NULL) {
         _PyEval_FormatExcCheckArg(
                     tstate, PyExc_NameError,
-                    NAME_ERROR_MSG, name);
+                    NAME_ERROR_MSG, name, op);
     }
     return value;
 }