Skip to content

gh-114682: Use METH_METHOD calling convention in _decimal #115196

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

Closed
neonene wants to merge 7 commits into from
Closed

gh-114682: Use METH_METHOD calling convention in _decimal #115196

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1da92a5
apply METH_MOTHOD
neonene Feb 9, 2024
36cbbdf
sync with main
neonene Feb 9, 2024
7403497
indent
neonene Feb 9, 2024
3a89ece
apply a _PyType_GetModuleState(cls)
neonene Feb 10, 2024
89172a1
revert 3a89ece
neonene Feb 10, 2024
a7e00b2
put on each , then cleanup
neonene Feb 10, 2024
1eeb531
switch to _PyType_GetModuleState() in *_impl()
neonene Feb 10, 2024
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
Prev Previous commit
Next Next commit
sync with main
  • Loading branch information
@neonene
neonene committed Feb 9, 2024
commit 36cbbdf48fb1eb5582b18ed3225f6c956d50a8a5
14 changes: 8 additions & 6 deletions Modules/_decimal/_decimal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3527,6 +3527,14 @@ dec_format_impl(PyObject *dec, PyTypeObject *cls, PyObject *fmtarg,
if (fmt == NULL) {
return NULL;
}

if (size > 0 && fmt[size-1] == 'N') {
if (PyErr_WarnEx(PyExc_DeprecationWarning,
"Format specifier 'N' is deprecated", 1) < 0) {
return NULL;
}
}

/* NOTE: If https://github.com/python/cpython/pull/29438 lands, the
* format string manipulation below can be eliminated by enhancing
* the forked mpd_parse_fmt_str(). */
Expand Down Expand Up @@ -3674,12 +3682,6 @@ dec_format_impl(PyObject *dec, PyTypeObject *cls, PyObject *fmtarg,
if (replace_fillchar) {
dec_replace_fillchar(decstring);
}
if (strchr(fmt, 'N') != NULL) {
if (PyErr_WarnEx(PyExc_DeprecationWarning,
"Format specifier 'N' is deprecated", 1) < 0) {
goto finish;
}
}

result = PyUnicode_DecodeUTF8(decstring, size, NULL);

Expand Down