Skip to content

gh-103092: Test _ctypes type hierarchy and features #113727

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

Merged
erlend-aasland merged 16 commits into from
Jan 9, 2024
Merged

gh-103092: Test _ctypes type hierarchy and features #113727

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1d95bbc
add inheritance hierarchy and other tests for ctypes base types
aisk Jan 4, 2024
6df089c
add tests for cfuncptr
aisk Jan 5, 2024
81802ae
add tests for CField
aisk Jan 5, 2024
a8b4d32
add test for COMError
aisk Jan 6, 2024
e48efc3
add support.py to export ctypes hidden types
aisk Jan 8, 2024
0cd6f88
change to check the type's mutablility by type.__flags__
aisk Jan 8, 2024
b031cc9
fix assert in support.py
aisk Jan 8, 2024
1e7c064
change more test to check the type.__flags__
aisk Jan 8, 2024
d843763
Update Lib/test/test_ctypes/support.py
aisk Jan 9, 2024
8636250
rename type flag symbol name
aisk Jan 9, 2024
6a0676c
move CField to support.py
aisk Jan 9, 2024
37aecd4
test the type flags with sub test
aisk Jan 9, 2024
3ccb964
rename support.py to _support.py to avoid ambiguous when import
aisk Jan 9, 2024
0ac92f0
align the import statement
aisk Jan 9, 2024
efd0d9f
Update Lib/test/test_ctypes/test_arrays.py
aisk Jan 9, 2024
2660e86
refactor the type flags check
aisk Jan 9, 2024
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
rename type flag symbol name
  • Loading branch information
@aisk
aisk committed Jan 9, 2024
commit 8636250fba84c06119ee9e6374c44e090dd14b5f
12 changes: 6 additions & 6 deletions Lib/test/test_ctypes/test_arrays.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
c_char, c_wchar, c_byte, c_ubyte, c_short, c_ushort, c_int, c_uint,
c_long, c_ulonglong, c_float, c_double, c_longdouble)
from test.support import bigmemtest, _2G
from .support import (_CData, PyCArrayType, PY_TPFLAGS_DISALLOW_INSTANTIATION,
PY_TPFLAGS_IMMUTABLETYPE)
from .support import (_CData, PyCArrayType, Py_TPFLAGS_DISALLOW_INSTANTIATION,
Py_TPFLAGS_IMMUTABLETYPE)


formats = "bBhHiIlLqQfd"
Expand All @@ -32,11 +32,11 @@ def test_inheritance_hierarchy(self):
self.assertEqual(type(PyCArrayType), type)

def test_type_flags(self):
self.assertTrue(Array.__flags__ & PY_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(Array.__flags__ & PY_TPFLAGS_DISALLOW_INSTANTIATION)
self.assertTrue(Array.__flags__ & Py_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(Array.__flags__ & Py_TPFLAGS_DISALLOW_INSTANTIATION)

self.assertTrue(PyCArrayType.__flags__ & PY_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(PyCArrayType.__flags__ & PY_TPFLAGS_DISALLOW_INSTANTIATION)
self.assertTrue(PyCArrayType.__flags__ & Py_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(PyCArrayType.__flags__ & Py_TPFLAGS_DISALLOW_INSTANTIATION)

def test_simple(self):
# create classes holding simple numeric types, and check
Expand Down
12 changes: 6 additions & 6 deletions Lib/test/test_ctypes/test_funcptr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import unittest
from ctypes import (CDLL, Structure, CFUNCTYPE, sizeof, _CFuncPtr,
c_void_p, c_char_p, c_char, c_int, c_uint, c_long)
from .support import (_CData, PyCFuncPtrType, PY_TPFLAGS_DISALLOW_INSTANTIATION,
PY_TPFLAGS_IMMUTABLETYPE)
from .support import (_CData, PyCFuncPtrType, Py_TPFLAGS_DISALLOW_INSTANTIATION,
Py_TPFLAGS_IMMUTABLETYPE)


try:
Expand All @@ -24,11 +24,11 @@ def test_inheritance_hierarchy(self):
self.assertEqual(type(PyCFuncPtrType), type)

def test_type_flags(self):
self.assertTrue(_CFuncPtr.__flags__ & PY_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(_CFuncPtr.__flags__ & PY_TPFLAGS_DISALLOW_INSTANTIATION)
self.assertTrue(_CFuncPtr.__flags__ & Py_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(_CFuncPtr.__flags__ & Py_TPFLAGS_DISALLOW_INSTANTIATION)

self.assertTrue(PyCFuncPtrType.__flags__ & PY_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(PyCFuncPtrType.__flags__ & PY_TPFLAGS_DISALLOW_INSTANTIATION)
self.assertTrue(PyCFuncPtrType.__flags__ & Py_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(PyCFuncPtrType.__flags__ & Py_TPFLAGS_DISALLOW_INSTANTIATION)

def test_basic(self):
X = WINFUNCTYPE(c_int, c_int, c_int)
Expand Down
12 changes: 6 additions & 6 deletions Lib/test/test_ctypes/test_pointers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
c_byte, c_ubyte, c_short, c_ushort, c_int, c_uint,
c_long, c_ulong, c_longlong, c_ulonglong,
c_float, c_double)
from .support import (_CData, PyCPointerType, PY_TPFLAGS_DISALLOW_INSTANTIATION,
PY_TPFLAGS_IMMUTABLETYPE)
from .support import (_CData, PyCPointerType, Py_TPFLAGS_DISALLOW_INSTANTIATION,
Py_TPFLAGS_IMMUTABLETYPE)


ctype_types = [c_byte, c_ubyte, c_short, c_ushort, c_int, c_uint,
Expand All @@ -28,11 +28,11 @@ def test_inheritance_hierarchy(self):
self.assertEqual(type(PyCPointerType), type)

def test_type_flags(self):
self.assertTrue(_Pointer.__flags__ & PY_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(_Pointer.__flags__ & PY_TPFLAGS_DISALLOW_INSTANTIATION)
self.assertTrue(_Pointer.__flags__ & Py_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(_Pointer.__flags__ & Py_TPFLAGS_DISALLOW_INSTANTIATION)

self.assertTrue(PyCPointerType.__flags__ & PY_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(PyCPointerType.__flags__ & PY_TPFLAGS_DISALLOW_INSTANTIATION)
self.assertTrue(PyCPointerType.__flags__ & Py_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(PyCPointerType.__flags__ & Py_TPFLAGS_DISALLOW_INSTANTIATION)

def test_pointer_crash(self):

Expand Down
12 changes: 6 additions & 6 deletions Lib/test/test_ctypes/test_simplesubclasses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import unittest
from ctypes import Structure, CFUNCTYPE, c_int, _SimpleCData
from .support import (_CData, PyCSimpleType, PY_TPFLAGS_DISALLOW_INSTANTIATION,
PY_TPFLAGS_IMMUTABLETYPE)
from .support import (_CData, PyCSimpleType, Py_TPFLAGS_DISALLOW_INSTANTIATION,
Py_TPFLAGS_IMMUTABLETYPE)


class MyInt(c_int):
Expand All @@ -21,11 +21,11 @@ def test_inheritance_hierarchy(self):
self.assertEqual(c_int.mro(), [c_int, _SimpleCData, _CData, object])

def test_type_flags(self):
self.assertTrue(_SimpleCData.__flags__ & PY_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(_SimpleCData.__flags__ & PY_TPFLAGS_DISALLOW_INSTANTIATION)
self.assertTrue(_SimpleCData.__flags__ & Py_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(_SimpleCData.__flags__ & Py_TPFLAGS_DISALLOW_INSTANTIATION)

self.assertTrue(PyCSimpleType.__flags__ & PY_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(PyCSimpleType.__flags__ & PY_TPFLAGS_DISALLOW_INSTANTIATION)
self.assertTrue(PyCSimpleType.__flags__ & Py_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(PyCSimpleType.__flags__ & Py_TPFLAGS_DISALLOW_INSTANTIATION)

def test_compare(self):
self.assertEqual(MyInt(3), MyInt(3))
Expand Down
6 changes: 3 additions & 3 deletions Lib/test/test_ctypes/test_struct_fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import unittest
from ctypes import Structure, Union, sizeof, c_char, c_int
from .support import PY_TPFLAGS_DISALLOW_INSTANTIATION, PY_TPFLAGS_IMMUTABLETYPE
from .support import Py_TPFLAGS_DISALLOW_INSTANTIATION, Py_TPFLAGS_IMMUTABLETYPE


class StructFieldsTestCase(unittest.TestCase):
Expand Down Expand Up @@ -63,8 +63,8 @@ def test_6(self):
self.assertRaises(TypeError, self.CField)

def test_cfield_type_flags(self):
self.assertTrue(self.CField.__flags__ & PY_TPFLAGS_DISALLOW_INSTANTIATION)
self.assertTrue(self.CField.__flags__ & PY_TPFLAGS_IMMUTABLETYPE)
self.assertTrue(self.CField.__flags__ & Py_TPFLAGS_DISALLOW_INSTANTIATION)
self.assertTrue(self.CField.__flags__ & Py_TPFLAGS_IMMUTABLETYPE)

def test_cfield_inheritance_hierarchy(self):
self.assertEqual(self.CField.mro(), [self.CField, object])
Expand Down
12 changes: 6 additions & 6 deletions Lib/test/test_ctypes/test_structures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
from struct import calcsize
from collections import namedtuple
from test import support
from .support import (_CData, PyCStructType, PY_TPFLAGS_DISALLOW_INSTANTIATION,
PY_TPFLAGS_IMMUTABLETYPE)
from .support import (_CData, PyCStructType, Py_TPFLAGS_DISALLOW_INSTANTIATION,
Py_TPFLAGS_IMMUTABLETYPE)


class SubclassesTest(unittest.TestCase):
Expand Down Expand Up @@ -80,11 +80,11 @@ def test_inheritance_hierarchy(self):


def test_type_flags(self):
self.assertTrue(Structure.__flags__ & PY_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(Structure.__flags__ & PY_TPFLAGS_DISALLOW_INSTANTIATION)
self.assertTrue(Structure.__flags__ & Py_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(Structure.__flags__ & Py_TPFLAGS_DISALLOW_INSTANTIATION)

self.assertTrue(PyCStructType.__flags__ & PY_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(PyCStructType.__flags__ & PY_TPFLAGS_DISALLOW_INSTANTIATION)
self.assertTrue(PyCStructType.__flags__ & Py_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(PyCStructType.__flags__ & Py_TPFLAGS_DISALLOW_INSTANTIATION)

def test_simple_structs(self):
for code, tp in self.formats.items():
Expand Down
12 changes: 6 additions & 6 deletions Lib/test/test_ctypes/test_unions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import unittest
from ctypes import Union
from .support import (_CData, UnionType, PY_TPFLAGS_DISALLOW_INSTANTIATION,
PY_TPFLAGS_IMMUTABLETYPE)
from .support import (_CData, UnionType, Py_TPFLAGS_DISALLOW_INSTANTIATION,
Py_TPFLAGS_IMMUTABLETYPE)


class ArrayTestCase(unittest.TestCase):
Expand All @@ -12,8 +12,8 @@ def test_inheritance_hierarchy(self):
self.assertEqual(type(UnionType), type)

def test_type_flags(self):
self.assertTrue(Union.__flags__ & PY_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(Union.__flags__ & PY_TPFLAGS_DISALLOW_INSTANTIATION)
self.assertTrue(Union.__flags__ & Py_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(Union.__flags__ & Py_TPFLAGS_DISALLOW_INSTANTIATION)

self.assertTrue(UnionType.__flags__ & PY_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(UnionType.__flags__ & PY_TPFLAGS_DISALLOW_INSTANTIATION)
self.assertTrue(UnionType.__flags__ & Py_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(UnionType.__flags__ & Py_TPFLAGS_DISALLOW_INSTANTIATION)
6 changes: 3 additions & 3 deletions Lib/test/test_ctypes/test_win32.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
_pointer_type_cache,
c_void_p, c_char, c_int, c_long)
from test import support
from .support import PY_TPFLAGS_DISALLOW_INSTANTIATION, PY_TPFLAGS_IMMUTABLETYPE
from .support import Py_TPFLAGS_DISALLOW_INSTANTIATION, Py_TPFLAGS_IMMUTABLETYPE


@unittest.skipUnless(sys.platform == "win32", 'Windows-specific test')
Expand Down Expand Up @@ -76,8 +76,8 @@ def test_COMError(self):

self.assertEqual(COMError.mro(),
[COMError, Exception, BaseException, object])
self.assertFalse(COMError.__flags__ & PY_TPFLAGS_DISALLOW_INSTANTIATION)
self.assertTrue(COMError.__flags__ & PY_TPFLAGS_IMMUTABLETYPE)
self.assertFalse(COMError.__flags__ & Py_TPFLAGS_DISALLOW_INSTANTIATION)
self.assertTrue(COMError.__flags__ & Py_TPFLAGS_IMMUTABLETYPE)


@unittest.skipUnless(sys.platform == "win32", 'Windows-specific test')
Expand Down