Skip to content

GH-90699: Remove _Py_IDENTIFIER usage from _json module #98956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 6 commits into from
Nov 2, 2022
Merged

GH-90699: Remove _Py_IDENTIFIER usage from _json module #98956

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
75a2b4a
port json
kumaraditya303 Nov 1, 2022
94c765d
restore comment
kumaraditya303 Nov 1, 2022
ac99ed4
regen
kumaraditya303 Nov 1, 2022
e1d3840
add comment
kumaraditya303 Nov 1, 2022
a3f7d24
even more strings
kumaraditya303 Nov 2, 2022
78f662c
Merge branch 'main' into json
kumaraditya303 Nov 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
port json
  • Loading branch information
@kumaraditya303
kumaraditya303 authored Nov 1, 2022
commit 75a2b4aec913b267a95ef037e8b8b920539141a0
16 changes: 3 additions & 13 deletions Modules/_json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#ifndef Py_BUILD_CORE_BUILTIN
# define Py_BUILD_CORE_MODULE 1
#endif
#define NEEDS_PY_IDENTIFIER

#include "Python.h"
#include "pycore_ceval.h" // _Py_EnterRecursiveCall()
Expand Down Expand Up @@ -304,20 +303,11 @@ escape_unicode(PyObject *pystr)
static void
raise_errmsg(const char *msg, PyObject *s, Py_ssize_t end)
{
/* Use JSONDecodeError exception to raise a nice looking ValueError subclass */
_Py_static_string(PyId_decoder, "json.decoder");
PyObject *decoder = _PyImport_GetModuleId(&PyId_decoder);
if (decoder == NULL) {
return;
}

_Py_IDENTIFIER(JSONDecodeError);
PyObject *JSONDecodeError = _PyObject_GetAttrId(decoder, &PyId_JSONDecodeError);
Py_DECREF(decoder);
PyObject *JSONDecodeError =
_PyImport_GetModuleAttrString("json.decoder", "JSONDecodeError");
Comment thread
kumaraditya303 marked this conversation as resolved.
Outdated
if (JSONDecodeError == NULL) {
return;
}

PyObject *exc;
exc = PyObject_CallFunction(JSONDecodeError, "zOn", msg, s, end);
Py_DECREF(JSONDecodeError);
Expand Down Expand Up @@ -1530,7 +1520,7 @@ encoder_encode_key_value(PyEncoderObject *s, _PyUnicodeWriter *writer, bool *fir

if (*first) {
*first = false;
}
}
else {
if (_PyUnicodeWriter_WriteStr(writer, s->item_separator) < 0) {
Py_DECREF(keystr);
Expand Down