Skip to content

gh-114563: C decimal falls back to pydecimal for unsupported format strings #114879

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
serhiy-storchaka merged 12 commits into from
Feb 12, 2024
+88 −122
Merged

gh-114563: C decimal falls back to pydecimal for unsupported format strings #114879

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d49d679
add decimal tests
belm0 Feb 1, 2024
b526004
revert 'z' format support in C decimal
belm0 Feb 1, 2024
6ac60d7
gh-114563: C decimal falls back to pydecimal for unsupported format s…
belm0 Feb 1, 2024
d37b5b8
Apply suggestions from code review
belm0 Feb 10, 2024
d2b6893
disable failing null fill test
belm0 Feb 10, 2024
feb7469
only override message string on ValueError
belm0 Feb 10, 2024
5803d9c
corrected null fill char test
belm0 Feb 10, 2024
dcee58f
honor round and capitals context in fallback
belm0 Feb 11, 2024
7a2ba4b
format fallback context tests
belm0 Feb 11, 2024
ab4f2d7
pass context directly to __format__()
belm0 Feb 11, 2024
3b1b8f4
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 11, 2024
06e371c
fix NEWS formatting
belm0 Feb 11, 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
honor round and capitals context in fallback
  • Loading branch information
@belm0
belm0 committed Feb 11, 2024
commit dcee58f3f3d5ada666954499ddc455370ddc4705
6 changes: 6 additions & 0 deletions Lib/_pydecimal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3841,6 +3841,12 @@ def __format__(self, specifier, context=None, _localeconv=None):
# of the formatting to the _format_number function
return _format_number(adjusted_sign, intpart, fracpart, exp, spec)

def _fallback_format(self, specifier, rounding, caps):
"""returns `__format__(specifier)` using a temporary context"""
c = Context(rounding=rounding, capitals=caps)
return self.__format__(specifier, c)


def _dec_from_triple(sign, coefficient, exponent, special=False):
"""Create a decimal instance directly, without any validation,
normalization (e.g. removal of leading zeros) or argument
Expand Down
12 changes: 9 additions & 3 deletions Modules/_decimal/_decimal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3370,10 +3370,12 @@ dict_get_item_string(PyObject *dict, const char *key, PyObject **valueobj, const
* https://www.bytereef.org/mpdecimal/doc/libmpdec/assign-convert.html#to-string
*/
static PyObject *
pydec_format(PyObject *dec, PyObject *fmt, decimal_state *state)
pydec_format(PyObject *dec, PyObject *context, PyObject *fmt, decimal_state *state)
{
PyObject *result;
PyObject *pydec;
PyObject *rounding;
PyObject *caps;
PyObject *u;

if (state->PyDecimal == NULL) {
Expand All @@ -3394,7 +3396,11 @@ pydec_format(PyObject *dec, PyObject *fmt, decimal_state *state)
return NULL;
}

result = PyObject_Format(pydec, fmt);
rounding = context_getround(context, NULL);
caps = context_getcapitals(context, NULL);
result = PyObject_CallMethod(pydec, "_fallback_format", "(OOO)", fmt, rounding, caps);
Comment thread
belm0 marked this conversation as resolved.
Outdated
Py_DECREF(rounding);
Py_DECREF(caps);
Py_DECREF(pydec);

if (result == NULL && PyErr_ExceptionMatches(PyExc_ValueError)) {
Expand Down Expand Up @@ -3466,7 +3472,7 @@ dec_format(PyObject *dec, PyObject *args)
PyMem_Free(fmt);
}

return pydec_format(dec, fmtarg, state);
return pydec_format(dec, context, fmtarg, state);
}

if (replace_fillchar) {
Expand Down