Skip to content
Closed
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
a2d90ae
Update datetimetester.py
neonene Apr 16, 2025
37d317f
Make interp-dict have a strong ref to the module
neonene Apr 16, 2025
44d09c9
Fix exc leak
neonene Apr 16, 2025
19326d4
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 16, 2025
c74251d
Merge branch 'main' into fix-132413
neonene Apr 16, 2025
f805ec7
Add assertion in test
neonene Apr 17, 2025
1539cc6
More assertion
neonene Apr 17, 2025
e6aa018
Allow only module's exec() to create interp-dict
neonene Apr 17, 2025
5141a76
Safer ref cycle between mod and interp-dict
neonene Apr 17, 2025
76cc153
Respect interp-dict held in module state
neonene Apr 17, 2025
e5bb7c8
Update _datetimemodule.c
neonene Apr 20, 2025
2645282
Merge branch 'main' into fix-132413
neonene Apr 20, 2025
87aa7a2
Update datetimetester.py
neonene Apr 20, 2025
b425bc8
Reword
neonene Apr 21, 2025
19de232
typo
neonene Apr 21, 2025
f7b78d9
Reword
neonene Apr 22, 2025
05811bb
Cleanup
neonene Apr 22, 2025
1416c6f
Merge branch 'main' into fix-132413
neonene Apr 22, 2025
351ac36
assert(!_Py_IsInterpreterFinalizing())
neonene Apr 24, 2025
0e4a263
Add tests
neonene Apr 25, 2025
fa0cc40
Update tests
neonene Apr 26, 2025
0377764
Take account of interp restart
neonene Apr 26, 2025
9af13a6
Add subinterp tests
neonene Apr 27, 2025
124d650
Fix tests for free-threaded builds
neonene Apr 27, 2025
c490586
Nit
neonene Apr 27, 2025
29c45a3
Merge branch 'main' into fix-132413
neonene Apr 27, 2025
db47683
Make tests generic
neonene Apr 27, 2025
ddd1635
Fix warnings
neonene Apr 27, 2025
746bf85
Update tests
neonene Apr 30, 2025
1cdaf5a
Merge branch 'main' into fix-132413
neonene Apr 30, 2025
a8f76fa
Revert to original (main)
neonene May 7, 2025
c7fc55e
Convert IsoCalendarDate to static type (3.12)
neonene May 7, 2025
b3d8a8e
Merge branch 'main' into fix-132413
neonene May 7, 2025
539cfed
Fix warning
neonene May 7, 2025
f2373f4
Merge branch 'main' into fix-132413
neonene May 8, 2025
d9f8544
Fix refleaks
neonene May 8, 2025
07ca91f
Ditto
neonene May 8, 2025
13b065f
Move up a function
neonene May 9, 2025
0052451
Smaller patch for tests
neonene May 13, 2025
fb29db1
Merge branch 'main' into fix-132413
neonene May 13, 2025
d2e2a11
Add a non-issue test case (closure)
neonene May 18, 2025
2da198e
minimize test
neonene Jun 23, 2025
2392247
Merge branch 'main' into fix-132413
neonene Jun 23, 2025
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
174 changes: 148 additions & 26 deletions Lib/test/datetimetester.py
Original file line number Diff line number Diff line change
Expand Up @@ -7155,48 +7155,75 @@ def test_datetime_from_timestamp(self):

self.assertEqual(dt_orig, dt_rt)

def test_type_check_in_subinterp(self):
def assert_python_ok_in_subinterp(self, script,
setup='_testcapi.test_datetime_capi()',
mainsetup='_testcapi.test_datetime_capi()',
config='isolated'):
# iOS requires the use of the custom framework loader,
# not the ExtensionFileLoader.
if sys.platform == "ios":
extension_loader = "AppleFrameworkLoader"
else:
extension_loader = "ExtensionFileLoader"

script = textwrap.dedent(f"""
maincode = textwrap.dedent(f'''
import textwrap
from test import support

subcode = textwrap.dedent("""
if {_interpreters is None}:
import _testcapi
else:
import importlib.machinery
import importlib.util
fullname = '_testcapi_datetime'
origin = importlib.util.find_spec('_testcapi').origin
loader = importlib.machinery.{extension_loader}(fullname, origin)
spec = importlib.util.spec_from_loader(fullname, loader)
_testcapi = importlib.util.module_from_spec(spec)
spec.loader.exec_module(_testcapi)

$SETUP$
$SCRIPT$
""")

import _testcapi
$MAINSETUP$

if {_interpreters is None}:
import _testcapi as module
module.test_datetime_capi()
ret = support.run_in_subinterp(subcode)
else:
import importlib.machinery
import importlib.util
fullname = '_testcapi_datetime'
origin = importlib.util.find_spec('_testcapi').origin
loader = importlib.machinery.{extension_loader}(fullname, origin)
spec = importlib.util.spec_from_loader(fullname, loader)
module = importlib.util.module_from_spec(spec)
spec.loader.exec_module(module)
import _interpreters
config = _interpreters.new_config('{config}').__dict__
ret = support.run_in_subinterp_with_config(subcode, **config)

assert ret == 0

''').replace('$MAINSETUP$', mainsetup)
maincode = maincode.replace('$SETUP$', textwrap.indent(setup, '\x20'*4))
maincode = maincode.replace('$SCRIPT$', textwrap.indent(script, '\x20'*4))

res = script_helper.assert_python_ok('-c', maincode)
return res

def test_type_check_in_subinterp(self):
script = textwrap.dedent(f"""
def run(type_checker, obj):
if not type_checker(obj, True):
raise TypeError(f'{{type(obj)}} is not C API type')

import _datetime
run(module.datetime_check_date, _datetime.date.today())
run(module.datetime_check_datetime, _datetime.datetime.now())
run(module.datetime_check_time, _datetime.time(12, 30))
run(module.datetime_check_delta, _datetime.timedelta(1))
run(module.datetime_check_tzinfo, _datetime.tzinfo())
run(_testcapi.datetime_check_date, _datetime.date.today())
run(_testcapi.datetime_check_datetime, _datetime.datetime.now())
run(_testcapi.datetime_check_time, _datetime.time(12, 30))
run(_testcapi.datetime_check_delta, _datetime.timedelta(1))
run(_testcapi.datetime_check_tzinfo, _datetime.tzinfo())
""")
if _interpreters is None:
ret = support.run_in_subinterp(script)
self.assertEqual(ret, 0)
else:
for name in ('isolated', 'legacy'):
with self.subTest(name):
config = _interpreters.new_config(name).__dict__
ret = support.run_in_subinterp_with_config(script, **config)
self.assertEqual(ret, 0)
self.assert_python_ok_in_subinterp(script, mainsetup='')
if _interpreters is not None:
with self.subTest('legacy'):
self.assert_python_ok_in_subinterp(script, mainsetup='',
config='legacy')


class ExtensionModuleTests(unittest.TestCase):
Expand Down Expand Up @@ -7270,8 +7297,103 @@ def test_update_type_cache(self):
assert isinstance(_datetime.timezone.utc, _datetime.tzinfo)
del sys.modules['_datetime']
""")
res = script_helper.assert_python_ok('-c', script)
self.assertFalse(res.err)

def test_static_type_at_shutdown1(self):
# gh-132413
script = textwrap.dedent("""
import sys
import _datetime

def gen():
try:
yield
finally:
# Exceptions are ignored here
assert not sys.modules
td = _datetime.timedelta(days=1)
assert td.days == 1
assert not sys.modules

it = gen()
next(it)
""")
res = script_helper.assert_python_ok('-c', script)
self.assertFalse(res.err)

def test_static_type_at_shutdown2(self):
script = textwrap.dedent("""
import sys
from _datetime import timedelta

def gen():
try:
yield
finally:
assert not sys.modules
td = timedelta(days=1)
assert td.days == 1
assert not sys.modules

it = gen()
next(it)
""")
res = script_helper.assert_python_ok('-c', script)
self.assertFalse(res.err)

def test_static_type_at_shutdown3(self):
script = textwrap.dedent("""
timedelta = _testcapi.get_capi_types()['timedelta']

def gen():
try:
yield
finally:
timedelta(days=1)

it = gen()
next(it)
""")
res = CapiTest.assert_python_ok_in_subinterp(self, script, setup='')
self.assertIn(b'ImportError: sys.meta_path is None', res.err)

def test_static_type_before_shutdown(self):
script = textwrap.dedent(f"""
import sys
assert '_datetime' not in sys.modules
timedelta = _testcapi.get_capi_types()['timedelta']
timedelta(days=1)
assert '_datetime' in sys.modules
""")
CapiTest.assert_python_ok_in_subinterp(self, script, setup='')

def test_remain_only_one_module(self):
script = textwrap.dedent("""
import sys
import gc
import weakref
ws = weakref.WeakSet()
for _ in range(3):
import _datetime
timedelta = _datetime.timedelta
ws.add(_datetime)
del sys.modules['_datetime']
del _datetime
gc.collect()
assert len(ws) == 1
""")
script_helper.assert_python_ok('-c', script)

@unittest.skipIf(not support.Py_DEBUG, "Debug builds only")
def test_no_leak(self):
script = textwrap.dedent("""
import datetime
datetime.datetime.strptime('20000101', '%Y%m%d').strftime('%Y%m%d')
""")
res = script_helper.assert_python_ok('-X', 'showrefcount', '-c', script)
self.assertIn(b'[0 refs, 0 blocks]', res.err)


def load_tests(loader, standard_tests, pattern):
standard_tests.addTest(ZoneInfoCompleteTest())
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix crash in C version of :mod:`datetime` when used during interpreter shutdown.
Loading
Loading