Skip to content

Commit 0aa9153

Browse files
[3.13] gh-143959: Fix test_datetime if _datetime is unavailable (GH-145248) (GH-146289)
(cherry picked from commit 97c725c) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
1 parent 2f1e341 commit 0aa9153

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

Lib/test/datetimetester.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@
4949
try:
5050
import _pydatetime
5151
except ImportError:
52-
pass
52+
_pydatetime = None
53+
try:
54+
import _datetime
55+
except ImportError:
56+
_datetime = None
5357
#
5458

5559
pickle_loads = {pickle.loads, pickle._loads}

Lib/test/test_datetime.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,19 @@ def load_tests(loader, tests, pattern):
1818
finally:
1919
# XXX: import_fresh_module() is supposed to leave sys.module cache untouched,
2020
# XXX: but it does not, so we have to cleanup ourselves.
21-
for modname in ['datetime', '_datetime', '_strptime']:
21+
for modname in ['datetime', '_datetime', '_pydatetime', '_strptime']:
2222
sys.modules.pop(modname, None)
2323

2424
test_modules = [pure_tests, fast_tests]
2525
test_suffixes = ["_Pure", "_Fast"]
26+
2627
# XXX(gb) First run all the _Pure tests, then all the _Fast tests. You might
2728
# not believe this, but in spite of all the sys.modules trickery running a _Pure
2829
# test last will leave a mix of pure and native datetime stuff lying around.
2930
for module, suffix in zip(test_modules, test_suffixes):
3031
test_classes = []
32+
if module is None:
33+
continue
3134
for name, cls in module.__dict__.items():
3235
if not isinstance(cls, type):
3336
continue
@@ -48,8 +51,8 @@ def setUpClass(cls_, module=module):
4851
cls_._save_sys_modules = sys.modules.copy()
4952
sys.modules[TESTS] = module
5053
sys.modules['datetime'] = module.datetime_module
51-
if hasattr(module, '_pydatetime'):
52-
sys.modules['_pydatetime'] = module._pydatetime
54+
sys.modules['_pydatetime'] = module._pydatetime
55+
sys.modules['_datetime'] = module._datetime
5356
sys.modules['_strptime'] = module._strptime
5457
super().setUpClass()
5558

0 commit comments

Comments
 (0)