Skip to content

[3.13] gh-120782: Update internal type cache when reloading datetime (GH-120829) #120855

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
kumaraditya303 merged 7 commits into from
Jul 3, 2024
Merged

[3.13] gh-120782: Update internal type cache when reloading datetime (GH-120829) #120855

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eb31592
[3.13] gh-120782: Update internal type cache when reloading datetime
neonene Jun 21, 2024
0f3c382
add test cases
neonene Jun 21, 2024
1459029
add missing asserts
neonene Jun 21, 2024
1020c94
add test cases
neonene Jun 21, 2024
09ec032
drop @no_rerun decorator from CapiTest class
neonene Jun 22, 2024
77f2ac2
Merge branch '3.13' into reload313
neonene Jun 25, 2024
289f6b4
Merge branch '3.13' into reload313
neonene Jun 29, 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
20 changes: 20 additions & 0 deletions Lib/test/datetimetester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6881,6 +6881,26 @@ def pickle_fake_date(datetime_) -> Type[FakeDate]:
""")
script_helper.assert_python_ok('-c', script)

def test_update_type_cache(self):
# gh-120782
script = textwrap.dedent("""
import sys
for i in range(5):
import _datetime
assert _datetime.date.max > _datetime.date.min
assert _datetime.time.max > _datetime.time.min
assert _datetime.datetime.max > _datetime.datetime.min
assert _datetime.timedelta.max > _datetime.timedelta.min
assert isinstance(_datetime.timezone.min, _datetime.tzinfo)
assert isinstance(_datetime.timezone.utc, _datetime.tzinfo)
assert isinstance(_datetime.timezone.max, _datetime.tzinfo)
assert _datetime.timezone.__dict__["min"] is _datetime.timezone.min
assert _datetime.timezone.__dict__["utc"] is _datetime.timezone.utc
assert _datetime.timezone.__dict__["max"] is _datetime.timezone.max
del sys.modules['_datetime']
""")
script_helper.assert_python_ok('-c', script)


def load_tests(loader, standard_tests, pattern):
standard_tests.addTest(ZoneInfoCompleteTest())
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2024-06-21-12-00-16.gh-issue-120782.LOE8tj.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix wrong references of the :mod:`datetime` types after reloading the module.
6 changes: 6 additions & 0 deletions Modules/_datetimemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7293,6 +7293,12 @@ _datetime_exec(PyObject *module)
static_assert(DI100Y == 25 * DI4Y - 1, "DI100Y");
assert(DI100Y == days_before_year(100+1));

if (reloading) {
for (size_t i = 0; i < Py_ARRAY_LENGTH(capi_types); i++) {
PyType_Modified(capi_types[i]);
}
}

if (set_current_module(interp, module) < 0) {
goto error;
}
Expand Down