mirror of
https://github.com/python/cpython.git
synced 2025-09-24 17:33:29 +00:00
[3.12] gh-105375: Improve error handling in zoneinfo
module (GH-105586) (#105612)
Fix bugs where exceptions could end up being overwritten
because of deferred error handling.
(cherry picked from commit 33c92c4f15
)
Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
This commit is contained in:
parent
4fbbf699c0
commit
8c4cf96a06
2 changed files with 13 additions and 7 deletions
|
@ -0,0 +1 @@
|
|||
Fix bugs in :mod:`zoneinfo` where exceptions could be overwritten.
|
|
@ -694,14 +694,19 @@ zoneinfo_fromutc(PyObject *obj_self, PyObject *dt)
|
|||
}
|
||||
else {
|
||||
PyObject *replace = PyObject_GetAttrString(tmp, "replace");
|
||||
PyObject *args = PyTuple_New(0);
|
||||
PyObject *kwargs = PyDict_New();
|
||||
|
||||
Py_DECREF(tmp);
|
||||
if (args == NULL || kwargs == NULL || replace == NULL) {
|
||||
Py_XDECREF(args);
|
||||
Py_XDECREF(kwargs);
|
||||
Py_XDECREF(replace);
|
||||
if (replace == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
PyObject *args = PyTuple_New(0);
|
||||
if (args == NULL) {
|
||||
Py_DECREF(replace);
|
||||
return NULL;
|
||||
}
|
||||
PyObject *kwargs = PyDict_New();
|
||||
if (kwargs == NULL) {
|
||||
Py_DECREF(replace);
|
||||
Py_DECREF(args);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue