export translation function and add translations to tokenizer

tonybaloney · Oct 25, 2024 · d640d98 · d640d98
1 parent ce1e361
commit d640d98
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
@@ -188,6 +188,7 @@ PyAPI_FUNC(PyObject *) PyErr_FormatV(
     const char *format,
     va_list vargs);
 #endif
+PyAPI_FUNC(const char*) PyErr_GetLocalizedException(const char* message);
 
 #ifdef MS_WINDOWS
 PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilename(

diff --git a/Parser/tokenizer/helpers.c b/Parser/tokenizer/helpers.c
@@ -19,7 +19,7 @@ _syntaxerror_range(struct tok_state *tok, const char *format,
         return ERRORTOKEN;
     }
     PyObject *errmsg, *errtext, *args;
-    errmsg = PyUnicode_FromFormatV(format, vargs);
+    errmsg = PyUnicode_FromFormatV(PyErr_GetLocalizedException(format), vargs);
     if (!errmsg) {
         goto error;
     }

diff --git a/Python/errors.c b/Python/errors.c
@@ -24,6 +24,9 @@ _PyErr_FormatV(PyThreadState *tstate, PyObject *exception,
 static const char*
 _PyErr_GetLocalizedException(PyThreadState* tstate, const char* message);
 
+static const char*
+PyErr_GetLocalizedException(const char* message);
+
 void
 _PyErr_SetRaisedException(PyThreadState *tstate, PyObject *exc)
 {
@@ -1154,7 +1157,7 @@ static const char* _PyErr_GetLocalizedException(PyThreadState *tstate, const cha
     if (tstate->interp->config.language == NULL)
         return message;
 
-    PyObject* exception_dict = PySys_GetObject("localized_exceptions");
+    PyObject* exception_dict = PySys_GetObject("localized_exceptions"); // Borrowed ref
     if (exception_dict == NULL) {
         return message;
     }
@@ -1174,12 +1177,18 @@ static const char* _PyErr_GetLocalizedException(PyThreadState *tstate, const cha
     // Get entry for string
     PyObject* entry = PyDict_GetItemString(lang_dict, message);
     if (entry == NULL) {
+        Py_DECREF(lang_dict);
         return message;
     }
 
     return PyUnicode_AsUTF8(entry);
 }
 
+static const char* PyErr_GetLocalizedException(const char* message){
+    PyThreadState *tstate = _PyThreadState_GET();
+    return _PyErr_GetLocalizedException(tstate, message);
+}
+
 static PyObject *
 _PyErr_FormatV(PyThreadState *tstate, PyObject *exception,
                const char *format, va_list vargs)