FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[3.13] gh-120782: Update internal type cache when reloading datetime (GH-120829) by neonene · Pull Request #120855 · python/cpython · GitHub

/ cpython Public
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .c  (1) .py  (1) .rst  (1) All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
52 changes: 32 additions & 20 deletions Lib/test/datetimetester.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -52,25 +52,6 @@
pass
#

# This is copied from test_import/__init__.py.
def no_rerun(reason):
"""Skip rerunning for a particular test.

WARNING: Use this decorator with care; skipping rerunning makes it
impossible to find reference leaks. Provide a clear reason for skipping the
test using the 'reason' parameter.
"""
def deco(func):
_has_run = False
def wrapper(self):
nonlocal _has_run
if _has_run:
self.skipTest(reason)
func(self)
_has_run = True
return wrapper
return deco

pickle_loads = {pickle.loads, pickle._loads}

pickle_choices = [(pickle, pickle, proto)
Expand Down Expand Up @@ -6412,7 +6393,6 @@ class IranTest(ZoneInfoTest):


@unittest.skipIf(_testcapi is None, 'need _testcapi module')
@no_rerun("the encapsulated datetime C API does not support reloading")
class CapiTest(unittest.TestCase):
def setUp(self):
# Since the C API is not present in the _Pure tests, skip all tests
Expand Down Expand Up @@ -6881,6 +6861,38 @@ 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 _datetime.date.__dict__["min"] is _datetime.date.min
assert _datetime.date.__dict__["max"] is _datetime.date.max
assert _datetime.date.__dict__["resolution"] is _datetime.date.resolution
assert _datetime.time.__dict__["min"] is _datetime.time.min
assert _datetime.time.__dict__["max"] is _datetime.time.max
assert _datetime.time.__dict__["resolution"] is _datetime.time.resolution
assert _datetime.datetime.__dict__["min"] is _datetime.datetime.min
assert _datetime.datetime.__dict__["max"] is _datetime.datetime.max
assert _datetime.datetime.__dict__["resolution"] is _datetime.datetime.resolution
assert _datetime.timedelta.__dict__["min"] is _datetime.timedelta.min
assert _datetime.timedelta.__dict__["max"] is _datetime.timedelta.max
assert _datetime.timedelta.__dict__["resolution"] is _datetime.timedelta.resolution
assert _datetime.timezone.__dict__["min"] is _datetime.timezone.min
assert _datetime.timezone.__dict__["max"] is _datetime.timezone.max
assert _datetime.timezone.__dict__["utc"] is _datetime.timezone.utc
assert isinstance(_datetime.timezone.min, _datetime.tzinfo)
assert isinstance(_datetime.timezone.max, _datetime.tzinfo)
assert isinstance(_datetime.timezone.utc, _datetime.tzinfo)
del sys.modules['_datetime']
""")
script_helper.assert_python_ok('-c', script)


def load_tests(loader, standard_tests, pattern):
standard_tests.addTest(ZoneInfoCompleteTest())
Expand Down
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
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

Back | FazBrowse Home | New Git URL