Skip to content

gh-143959 Make _datetime,_types optional for test_types #144042

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
youknowone wants to merge 4 commits into
base: main
Choose a base branch
from
Open

gh-143959 Make _datetime,_types optional for test_types #144042

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3b9317
gh-143959 Make _datetime optional for test_types
youknowone Jan 19, 2026
e17be43
gh-143959: Make _types optional for test_types
youknowone Jan 19, 2026
52b0e16
Merge remote-tracking branch 'upstream/main' into test_types-_datetime
youknowone Feb 19, 2026
9fcb7a4
Skip test_capsule_type when no _types
youknowone Feb 19, 2026
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
Prev Previous commit
Next Next commit
gh-143959: Make _types optional for test_types
  • Loading branch information
@youknowone
youknowone committed Jan 19, 2026
commit e17be434ba56ac6801fdd0f202b6b0d0e242d643
31 changes: 23 additions & 8 deletions Lib/test/test_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
import _datetime
except ModuleNotFoundError:
_datetime = None
try:
import _types
except ModuleNotFoundError:
_types = None

c_types = import_fresh_module('types', fresh=['_types'])
py_types = import_fresh_module('types', blocked=['_types'])
Expand All @@ -43,15 +47,10 @@ def clear_typing_caches():

class TypesTests(unittest.TestCase):

def test_names(self):

@serhiy-storchaka serhiy-storchaka Jan 20, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why these changes were needed?

@youknowone youknowone Jan 21, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Current test only runs meaningful when _types optional module is implemented.
Usually Python unittest includes conditional handling to run tests under proper environment, but this test was exposed without it.
Adding checking _types split the test and verify the behavior regardless the environment has _types or not.

@serhiy-storchaka serhiy-storchaka Jan 21, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How did you test this?

Note that import_fresh_module() returns None when one of the "fresh" modules can not be imported.

@youknowone youknowone Feb 19, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's exactly the cause of the problem. The test doesn't work when they are None.

local patch

diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
index 39d57c5f5b6..3a7c2c5f3bf 100644
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -23,8 +23,8 @@
 import typing
 import re
 
-c_types = import_fresh_module('types', fresh=['_types'])
-py_types = import_fresh_module('types', blocked=['_types'])
+c_types = import_fresh_module('types', fresh=['_no_types'])
+py_types = import_fresh_module('types', blocked=['_no_types'])
 
 T = typing.TypeVar("T")
./python.exe -m test test_types
Using random seed: 763234965
0:00:00 load avg: 5.65 Run 1 test sequentially in a single process
0:00:00 load avg: 5.65 [1/1] test_types
test test_types failed -- Traceback (most recent call last):
  File "/Users/al03219714/Projects/cpython/Lib/test/test_types.py", line 48, in test_names
    for name in c_types.__all__:
                ^^^^^^^^^^^^^^^
AttributeError: 'NoneType' object has no attribute '__all__'. Did you mean '.__le__' instead of '.__all__'?

0:00:00 load avg: 5.65 [1/1/1] test_types failed (1 error)

== Tests result: FAILURE ==

1 test failed:
    test_types

Total duration: 210 ms
Total tests: run=131 skipped=1
Total test files: run=1/1 failed=1
Result: FAILURE

btw, I am sorry for the late response.

@youknowone youknowone Feb 19, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I deleted _types to check the changed tests pass.

diff --git a/Modules/Setup b/Modules/Setup
index 7d816ead843..8641aaeba61 100644
--- a/Modules/Setup
+++ b/Modules/Setup
@@ -149,7 +149,6 @@ PYTHONPATH=$(COREPYTHONPATH)
 #_socket socketmodule.c
 #_statistics _statisticsmodule.c
 #_struct _struct.c
-#_types _typesmodule.c
 #_typing _typingmodule.c
 #_zoneinfo _zoneinfo.c
 #array arraymodule.c

Also edited capsule test to be skipped when _types doesn't exist

@serhiy-storchaka serhiy-storchaka Feb 19, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't like that c_only_names and ignored are defined in several places.

Would not be easier to simply skip tests that require c_types if it is not available?

diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
index 39d57c5f5b6..33020f4080a 100644
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -45,10 +45,6 @@ def test_names(self):
         ignored = {'new_class', 'resolve_bases', 'prepare_class',
                    'get_original_bases', 'DynamicClassAttribute', 'coroutine'}
 
-        for name in c_types.__all__:
-            if name not in c_only_names | ignored:
-                self.assertIs(getattr(c_types, name), getattr(py_types, name))
-
         all_names = ignored | {
             'AsyncGeneratorType', 'BuiltinFunctionType', 'BuiltinMethodType',
             'CapsuleType', 'CellType', 'ClassMethodDescriptorType', 'CodeType',
@@ -61,8 +57,13 @@ def test_names(self):
             'NotImplementedType', 'SimpleNamespace', 'TracebackType',
             'UnionType', 'WrapperDescriptorType',
         }
-        self.assertEqual(all_names, set(c_types.__all__))
         self.assertEqual(all_names - c_only_names, set(py_types.__all__))
+        if c_types is not None:
+            self.assertEqual(all_names, set(c_types.__all__))
+            for name in c_types.__all__:
+                if name not in c_only_names | ignored:
+                    self.assertIs(getattr(c_types, name), getattr(py_types, name))
+
 
     def test_truth_values(self):
         if None: self.fail('None is true instead of false')

And since c_types and py_types are only used in this test, I would import them locally.

def check_types_names(self, module_types, *, c_extension=False):
c_only_names = {'CapsuleType'}
ignored = {'new_class', 'resolve_bases', 'prepare_class',
'get_original_bases', 'DynamicClassAttribute', 'coroutine'}

for name in c_types.__all__:
if name not in c_only_names | ignored:
self.assertIs(getattr(c_types, name), getattr(py_types, name))

all_names = ignored | {
'AsyncGeneratorType', 'BuiltinFunctionType', 'BuiltinMethodType',
'CapsuleType', 'CellType', 'ClassMethodDescriptorType', 'CodeType',
Expand All @@ -63,8 +62,24 @@ def test_names(self):
'ModuleType', 'NoneType', 'NotImplementedType', 'SimpleNamespace',
'TracebackType', 'UnionType', 'WrapperDescriptorType',
}
self.assertEqual(all_names, set(c_types.__all__))
self.assertEqual(all_names - c_only_names, set(py_types.__all__))
expected = all_names if c_extension else all_names - c_only_names
self.assertEqual(expected, set(module_types.__all__))

@unittest.skipUnless(_types, "requires C _types module")
def test_c_types_names(self):
self.check_types_names(c_types, c_extension=True)

def test_py_types_names(self):
self.check_types_names(py_types, c_extension=False)

@unittest.skipUnless(_types, "requires C _types module")
def test_types_names_consistency(self):
c_only_names = {'CapsuleType'}
ignored = {'new_class', 'resolve_bases', 'prepare_class',
'get_original_bases', 'DynamicClassAttribute', 'coroutine'}
for name in c_types.__all__:
if name not in c_only_names | ignored:
self.assertIs(getattr(c_types, name), getattr(py_types, name))

def test_truth_values(self):
if None: self.fail('None is true instead of false')
Expand Down
Loading