Skip to content

gh-143959: Fix test_datetime if _datetime is unavailable #145248

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

Open
serhiy-storchaka wants to merge 1 commit into
base: main
Choose a base branch
from
Open

gh-143959: Fix test_datetime if _datetime is unavailable #145248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion Lib/test/datetimetester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@
try:
import _pydatetime
except ImportError:
pass
_pydatetime = None
try:
import _datetime
except ImportError:
_datetime = None
#

pickle_loads = {pickle.loads, pickle._loads}
Expand Down
9 changes: 6 additions & 3 deletions Lib/test/test_datetime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,19 @@ def load_tests(loader, tests, pattern):
finally:
# XXX: import_fresh_module() is supposed to leave sys.module cache untouched,
# XXX: but it does not, so we have to cleanup ourselves.
for modname in ['datetime', '_datetime', '_strptime']:
for modname in ['datetime', '_datetime', '_pydatetime', '_strptime']:
sys.modules.pop(modname, None)

test_modules = [pure_tests, fast_tests]
test_suffixes = ["_Pure", "_Fast"]

# XXX(gb) First run all the _Pure tests, then all the _Fast tests. You might
# not believe this, but in spite of all the sys.modules trickery running a _Pure
# test last will leave a mix of pure and native datetime stuff lying around.
for module, suffix in zip(test_modules, test_suffixes):
test_classes = []
if module is None:
continue
for name, cls in module.__dict__.items():
if not isinstance(cls, type):
continue
Expand All @@ -48,8 +51,8 @@ def setUpClass(cls_, module=module):
cls_._save_sys_modules = sys.modules.copy()
sys.modules[TESTS] = module
sys.modules['datetime'] = module.datetime_module
if hasattr(module, '_pydatetime'):
sys.modules['_pydatetime'] = module._pydatetime
sys.modules['_pydatetime'] = module._pydatetime
sys.modules['_datetime'] = module._datetime
sys.modules['_strptime'] = module._strptime
super().setUpClass()

Expand Down
Loading