gh-105751: test_ctypes avoids "from ctypes import *" (#105768)

Using "import *" prevents linters like pyflakes to detect undefined names
(usually missing imports).

Replace c_voidp with c_void_p.
This commit is contained in:
Victor Stinner 2023-06-14 05:34:11 +02:00 committed by GitHub
parent 381a1dc261
commit b95de96268
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
48 changed files with 180 additions and 84 deletions

View File

@ -1,5 +1,5 @@
import sys
from ctypes import *
from ctypes import Array, Structure, Union
_array_type = type(Array)

View File

@ -1,6 +1,6 @@
import unittest
import test.support
from ctypes import *
from ctypes import c_int, Union, Structure, sizeof
class AnonTest(unittest.TestCase):

View File

@ -1,5 +1,5 @@
import unittest
from ctypes import *
from ctypes import c_byte, Structure, POINTER, cast
from binascii import hexlify
import re

View File

@ -2,7 +2,10 @@ import ctypes
import sys
import unittest
import warnings
from ctypes import *
from ctypes import (Structure, Array, sizeof, addressof,
create_string_buffer, create_unicode_buffer,
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 test.test_ctypes import need_symbol

View File

@ -1,8 +1,12 @@
import unittest
import ctypes
from ctypes import *
from test.test_ctypes import need_symbol
import _ctypes_test
import ctypes
import unittest
from ctypes import (Structure, CDLL, CFUNCTYPE,
POINTER, pointer, byref,
c_short, c_int, c_long, c_longlong,
c_byte, c_wchar, c_float, c_double,
ArgumentError)
from test.test_ctypes import need_symbol
dll = CDLL(_ctypes_test.__file__)

View File

@ -1,4 +1,8 @@
from ctypes import *
from ctypes import (CDLL, Structure, sizeof, POINTER, byref, alignment,
LittleEndianStructure, BigEndianStructure,
c_byte, c_ubyte, c_char, c_char_p, c_void_p, c_wchar,
c_uint32, c_uint64,
c_short, c_ushort, c_int, c_uint, c_long, c_ulong, c_longlong, c_ulonglong)
from test.test_ctypes import need_symbol
from test import support
import unittest

View File

@ -1,4 +1,5 @@
from ctypes import *
from ctypes import (create_string_buffer, create_unicode_buffer, sizeof,
c_char, c_wchar)
from test.test_ctypes import need_symbol
import unittest

View File

@ -1,7 +1,7 @@
"""Test where byte objects are accepted"""
import unittest
import sys
from ctypes import *
import unittest
from ctypes import Structure, c_char, c_char_p, c_wchar, c_wchar_p
class BytesTest(unittest.TestCase):
def test_c_char(self):

View File

@ -1,7 +1,13 @@
import sys, unittest, struct, math, ctypes
from binascii import hexlify
from ctypes import *
from ctypes import (Structure, Union, LittleEndianUnion, BigEndianUnion,
BigEndianStructure, LittleEndianStructure,
POINTER, sizeof, cast,
c_byte, c_ubyte, c_char, c_wchar, c_void_p,
c_short, c_ushort, c_int, c_uint,
c_long, c_ulong, c_longlong, c_ulonglong,
c_uint32, c_float, c_double)
def bin(s):
return hexlify(memoryview(s)).decode().upper()

View File

@ -3,7 +3,12 @@ import unittest
from test import support
import ctypes
from ctypes import *
from ctypes import (CDLL, cdll, Structure, CFUNCTYPE,
ArgumentError, POINTER, sizeof,
c_byte, c_ubyte, c_char, c_char_p,
c_short, c_ushort, c_int, c_uint,
c_long, c_longlong, c_ulonglong, c_ulong,
c_float, c_double, c_longdouble, py_object)
from test.test_ctypes import need_symbol
from _ctypes import CTYPES_MAX_ARGCOUNT
import _ctypes_test

View File

@ -1,7 +1,9 @@
from ctypes import *
from test.test_ctypes import need_symbol
import unittest
import sys
import unittest
from ctypes import (Structure, Union, POINTER, cast, sizeof, addressof,
c_void_p, c_char_p, c_wchar_p,
c_byte, c_short, c_int)
from test.test_ctypes import need_symbol
class Test(unittest.TestCase):

View File

@ -1,13 +1,14 @@
# A lot of failures in these tests on Mac OS X.
# Byte order related?
import unittest
import ctypes
from ctypes import *
from ctypes import (CDLL,
c_byte, c_ubyte, c_char,
c_short, c_ushort, c_int, c_uint,
c_long, c_ulong, c_longlong, c_ulonglong,
c_float, c_double, c_longdouble)
from test.test_ctypes import need_symbol
import _ctypes_test
class CFunctions(unittest.TestCase):
_dll = CDLL(_ctypes_test.__file__)
@ -210,5 +211,6 @@ if hasattr(ctypes, 'WinDLL'):
class stdcallCFunctions(CFunctions):
_dll = stdcall_dll(_ctypes_test.__file__)
if __name__ == '__main__':
unittest.main()

View File

@ -1,15 +1,16 @@
import unittest
import ctypes
from ctypes import *
import unittest
from ctypes import CDLL, c_int
from test.test_ctypes import need_symbol
class CHECKED(c_int):
def _check_retval_(value):
# Receives a CHECKED instance.
return str(value.value)
_check_retval_ = staticmethod(_check_retval_)
class Test(unittest.TestCase):
def test_checkretval(self):
@ -32,5 +33,7 @@ class Test(unittest.TestCase):
oleaut32 = ctypes.oledll.oleaut32
self.assertRaises(OSError, oleaut32.CreateTypeLib2, 0, None, None)
if __name__ == "__main__":
unittest.main()

View File

@ -1,9 +1,11 @@
import unittest
from ctypes import *
from ctypes import Structure, c_char, c_int
class X(Structure):
_fields_ = [("foo", c_int)]
class TestCase(unittest.TestCase):
def test_simple(self):
self.assertRaises(TypeError,
@ -17,5 +19,6 @@ class TestCase(unittest.TestCase):
self.assertRaises(TypeError,
delattr, X(), "foo")
if __name__ == "__main__":
unittest.main()

View File

@ -2,14 +2,15 @@ import unittest, os, errno
import threading
import ctypes
from ctypes import *
from ctypes import CDLL, c_int, c_char_p, c_wchar_p, get_errno, set_errno
from ctypes.util import find_library
class Test(unittest.TestCase):
def test_open(self):
libc_name = find_library("c")
if libc_name is None:
raise unittest.SkipTest("Unable to find C library")
self.skipTest("Unable to find C library")
libc = CDLL(libc_name, use_errno=True)
if os.name == "nt":
libc_open = libc._open
@ -73,5 +74,6 @@ class Test(unittest.TestCase):
ctypes.set_last_error(0)
if __name__ == "__main__":
unittest.main()

View File

@ -1,11 +1,12 @@
import unittest
import unittest.mock
import os.path
import sys
import test.support
from test.support import os_helper
from ctypes import *
import unittest
import unittest.mock
from ctypes import CDLL, RTLD_GLOBAL
from ctypes.util import find_library
from test.support import os_helper
# On some systems, loading the OpenGL libraries needs the RTLD_GLOBAL mode.
class Test_OpenGL_libs(unittest.TestCase):
@ -36,11 +37,13 @@ class Test_OpenGL_libs(unittest.TestCase):
cls.gl = CDLL(lib_gl, mode=RTLD_GLOBAL)
except OSError:
pass
if lib_glu:
try:
cls.glu = CDLL(lib_glu, RTLD_GLOBAL)
except OSError:
pass
if lib_gle:
try:
cls.gle = CDLL(lib_gle)

View File

@ -1,7 +1,7 @@
from ctypes import *
import array
import gc
import unittest
from ctypes import Structure, Union, Array, sizeof, c_char, c_int
class X(Structure):
_fields_ = [("c_int", c_int)]

View File

@ -1,6 +1,8 @@
import unittest
import _ctypes_test
import ctypes
from ctypes import *
import unittest
from ctypes import (CDLL, Structure, CFUNCTYPE, sizeof,
c_void_p, c_char_p, c_char, c_int, c_uint, c_long)
try:
WINFUNCTYPE = ctypes.WINFUNCTYPE
@ -8,9 +10,9 @@ except AttributeError:
# fake to enable this test on Linux
WINFUNCTYPE = CFUNCTYPE
import _ctypes_test
lib = CDLL(_ctypes_test.__file__)
class CFuncPtrTestCase(unittest.TestCase):
def test_basic(self):
X = WINFUNCTYPE(c_int, c_int, c_int)
@ -21,8 +23,8 @@ class CFuncPtrTestCase(unittest.TestCase):
x = X(func)
self.assertEqual(x.restype, c_int)
self.assertEqual(x.argtypes, (c_int, c_int))
self.assertEqual(sizeof(x), sizeof(c_voidp))
self.assertEqual(sizeof(X), sizeof(c_voidp))
self.assertEqual(sizeof(x), sizeof(c_void_p))
self.assertEqual(sizeof(X), sizeof(c_void_p))
def test_first(self):
StdCallback = WINFUNCTYPE(c_int, c_int, c_int)
@ -129,5 +131,6 @@ class CFuncPtrTestCase(unittest.TestCase):
self.assertRaises(TypeError, _CFuncPtr, 13, "name", 42, "iid")
if __name__ == '__main__':
unittest.main()

View File

@ -6,7 +6,11 @@ Later...
"""
import ctypes
from ctypes import *
from ctypes import (CDLL, Structure, Array, CFUNCTYPE,
byref, POINTER, pointer, ArgumentError,
c_char, c_wchar, c_byte, c_char_p,
c_short, c_int, c_long, c_longlong,
c_float, c_double, c_longdouble)
from test.test_ctypes import need_symbol
import sys, unittest

View File

@ -1,7 +1,7 @@
import ctypes
import unittest
import warnings
from ctypes import *
from ctypes import Structure, POINTER, pointer, c_char_p
################################################################
#

View File

@ -1,5 +1,6 @@
from ctypes import *
import unittest
from ctypes import Structure, c_int
class X(Structure):
_fields_ = [("a", c_int),
@ -15,6 +16,7 @@ class X(Structure):
self.a = 9
self.b = 12
class Y(Structure):
_fields_ = [("x", X)]
@ -36,5 +38,6 @@ class InitTest(unittest.TestCase):
self.assertEqual((y.x.a, y.x.b), (9, 12))
self.assertEqual(y.x.new_was_called, False)
if __name__ == "__main__":
unittest.main()

View File

@ -1,6 +1,6 @@
# This tests the internal _objects attribute
import unittest
from ctypes import *
from ctypes import Structure, POINTER, c_char_p, c_int
from sys import getrefcount as grc
# XXX This test must be reviewed for correctness!!!

View File

@ -1,4 +1,4 @@
from ctypes import *
from ctypes import Structure, POINTER, pointer, c_char_p, c_int
import unittest
class SimpleTestCase(unittest.TestCase):

View File

@ -1,10 +1,13 @@
import unittest
from ctypes import *
import _ctypes_test
from ctypes import (CDLL, CFUNCTYPE, POINTER, create_string_buffer, sizeof,
c_void_p, c_char, c_int, c_double, c_size_t)
import _ctypes_test
lib = CDLL(_ctypes_test.__file__)
def three_way_cmp(x, y):
"""Return -1 if x < y, 0 if x == y and 1 if x > y"""
return (x > y) - (x < y)

View File

@ -1,15 +1,15 @@
from ctypes import *
import ctypes
import os
import shutil
import subprocess
import sys
import unittest
import test.support
from test.support import import_helper
from test.support import os_helper
import unittest
from test.support import import_helper, os_helper
from ctypes import CDLL, cdll, addressof, c_void_p, c_char_p
from ctypes.util import find_library
libc_name = None
def setUpModule():
@ -126,6 +126,7 @@ class LoaderTest(unittest.TestCase):
kernel32.GetProcAddress.restype = c_void_p
proc = kernel32.GetProcAddress(advapi32._handle, b"CloseEventLog")
self.assertTrue(proc)
# This is the real test: call the function via 'call_function'
self.assertEqual(0, call_function(proc, (None,)))
@ -196,6 +197,5 @@ class LoaderTest(unittest.TestCase):
"WinDLL('_sqlite3.dll'); p.close()")
if __name__ == "__main__":
unittest.main()

View File

@ -1,7 +1,11 @@
import sys
from test import support
import unittest
from ctypes import *
from ctypes import (POINTER, sizeof, cast,
create_string_buffer, string_at,
create_unicode_buffer, wstring_at,
memmove, memset,
c_char_p, c_byte, c_ubyte, c_wchar)
from test.test_ctypes import need_symbol
class MemFunctionsTest(unittest.TestCase):

View File

@ -3,8 +3,10 @@ import sys
import unittest
from array import array
from operator import truth
from ctypes import *
from ctypes import _SimpleCData
from ctypes import (byref, sizeof, alignment, _SimpleCData,
c_char, c_byte, c_ubyte, c_short, c_ushort, c_int, c_uint,
c_long, c_ulong, c_longlong, c_ulonglong,
c_float, c_double, c_longdouble, c_bool)
def valid_ranges(*types):
# given a sequence of numeric types, collect their _type_

View File

@ -11,7 +11,7 @@ is None.
Here is an array of string pointers:
>>> from ctypes import *
>>> from ctypes import Structure, c_int, c_char_p
>>> array = (c_char_p * 5)()
>>> print(array._objects)
None

View File

@ -1,5 +1,10 @@
import unittest
from ctypes import *
from ctypes import (CFUNCTYPE, POINTER, sizeof, Union,
Structure, LittleEndianStructure, BigEndianStructure,
c_char, c_byte, c_ubyte,
c_short, c_ushort, c_int, c_uint,
c_long, c_ulong, c_longlong, c_ulonglong, c_uint64,
c_bool, c_float, c_double, c_longdouble, py_object)
import re, sys
if sys.byteorder == "little":

View File

@ -1,9 +1,13 @@
import unittest
import pickle
from ctypes import *
from ctypes import (CDLL, Structure, CFUNCTYPE, pointer,
c_void_p, c_char_p, c_wchar_p, c_char, c_wchar, c_int, c_double)
import _ctypes_test
dll = CDLL(_ctypes_test.__file__)
class X(Structure):
_fields_ = [("a", c_int), ("b", c_double)]
init_called = 0

View File

@ -1,8 +1,11 @@
import unittest, sys
import ctypes
from ctypes import *
import _ctypes_test
import ctypes
import sys
import unittest
from ctypes import (CDLL, CFUNCTYPE, Structure, POINTER, pointer, byref, sizeof,
c_void_p, c_char_p,
c_byte, c_ubyte, c_short, c_ushort, c_int, c_uint,
c_long, c_ulong, c_longlong, c_ulonglong, c_float, c_double)
ctype_types = [c_byte, c_ubyte, c_short, c_ushort, c_int, c_uint,
c_long, c_ulong, c_longlong, c_ulonglong, c_double, c_float]

View File

@ -1,4 +1,7 @@
from ctypes import *
from ctypes import (CDLL, CFUNCTYPE, POINTER, ArgumentError,
pointer, byref, sizeof, addressof,
c_void_p, c_char_p, c_wchar_p, c_char, c_wchar, c_buffer,
c_short, c_int, c_long, c_longlong, c_double)
from test.test_ctypes import need_symbol
import unittest

View File

@ -1,6 +1,8 @@
from ctypes import *
import unittest
from test import support
from ctypes import (pythonapi, POINTER, c_buffer, sizeof,
py_object, c_char_p, c_char, c_long, c_size_t)
################################################################
# This section should be moved into ctypes\__init__.py, when it's ready.
@ -82,5 +84,6 @@ class PythonAPITestCase(unittest.TestCase):
self.assertEqual(repr(py_object(42)), "py_object(42)")
self.assertEqual(repr(py_object(object)), "py_object(%r)" % object)
if __name__ == "__main__":
unittest.main()

View File

@ -1,9 +1,9 @@
from ctypes import *
import ctypes
import contextlib
from test import support
import unittest
import ctypes
import sys
import unittest
from test import support
from ctypes import CFUNCTYPE, c_void_p, c_char_p, c_int, c_double
def callback_func(arg):

View File

@ -1,4 +1,6 @@
from ctypes import *
from ctypes import (c_byte, c_short, c_int, c_long, c_longlong,
c_ubyte, c_ushort, c_uint, c_ulong, c_ulonglong,
c_float, c_double, c_longdouble, c_bool, c_char)
import unittest
subclasses = []
@ -25,5 +27,6 @@ class ReprTest(unittest.TestCase):
self.assertEqual("c_char(b'x')", repr(c_char(b'x')))
self.assertEqual("<X object at", repr(X(b'x'))[:12])
if __name__ == "__main__":
unittest.main()

View File

@ -1,5 +1,5 @@
import unittest
from ctypes import *
from ctypes import CDLL, CFUNCTYPE, ArgumentError, c_char_p, c_void_p, c_char
import _ctypes_test
@ -62,5 +62,6 @@ class ReturnFuncPtrTestCase(unittest.TestCase):
self.assertRaises(ArgumentError, strchr, b"abcdef", 3.0)
self.assertRaises(TypeError, strchr, b"abcdef")
if __name__ == "__main__":
unittest.main()

View File

@ -1,5 +1,6 @@
import unittest
from ctypes import *
from ctypes import Structure, CFUNCTYPE, c_int
class MyInt(c_int):
def __eq__(self, other):
@ -7,6 +8,7 @@ class MyInt(c_int):
return NotImplementedError
return self.value == other.value
class Test(unittest.TestCase):
def test_compare(self):
@ -51,5 +53,6 @@ class Test(unittest.TestCase):
self.assertEqual(s.x, MyInt(42))
if __name__ == "__main__":
unittest.main()

View File

@ -1,7 +1,9 @@
# Test specifically-sized containers.
from ctypes import *
from ctypes import (sizeof,
c_int8, c_uint8, c_int16, c_uint16,
c_int32, c_uint32, c_int64, c_uint64,
c_void_p, c_size_t, c_ssize_t, c_time_t, SIZEOF_TIME_T)
import unittest

View File

@ -1,5 +1,6 @@
import unittest
from ctypes import *
from ctypes import (CDLL, POINTER, sizeof,
c_byte, c_short, c_int, c_long, c_char, c_wchar, c_char_p)
from test.test_ctypes import need_symbol
import _ctypes_test

View File

@ -1,6 +1,6 @@
import unittest
from test import support
from ctypes import *
from ctypes import CDLL, Structure, POINTER, c_buffer, c_char, c_char_p
import _ctypes_test

View File

@ -1,5 +1,5 @@
import unittest
from ctypes import *
from ctypes import c_buffer, sizeof, byref, c_char, c_wchar
from test.test_ctypes import need_symbol
class StringArrayTestCase(unittest.TestCase):

View File

@ -1,5 +1,5 @@
import unittest
from ctypes import *
from ctypes import Structure, Union, sizeof, c_char, c_int
class StructFieldsTestCase(unittest.TestCase):
# Structure/Union classes must get 'finalized' sooner or

View File

@ -1,7 +1,11 @@
import platform
import sys
import unittest
from ctypes import *
from ctypes import (CDLL, Structure, Union, POINTER, sizeof, byref, alignment,
c_void_p, c_char, c_wchar, c_byte, c_ubyte,
c_uint8, c_uint16, c_uint32,
c_short, c_ushort, c_int, c_uint,
c_long, c_ulong, c_longlong, c_ulonglong, c_float, c_double)
from test.test_ctypes import need_symbol
from struct import calcsize
import _ctypes_test

View File

@ -1,5 +1,8 @@
import sys, unittest
from ctypes import *
from ctypes import (Structure, BigEndianStructure, LittleEndianStructure,
c_byte, c_short, c_int, c_long, c_longlong,
c_float, c_double,
c_ushort, c_uint, c_ulong, c_ulonglong)
structures = []
byteswapped_structures = []

View File

@ -6,7 +6,7 @@ import _imp
import importlib.util
import unittest
import sys
from ctypes import *
from ctypes import Structure, CDLL, POINTER, pythonapi, c_ubyte, c_char_p, c_int
from test.support import import_helper
import _ctypes_test

View File

@ -1,4 +1,4 @@
from ctypes import *
from ctypes import Structure, sizeof, resize, c_int
import unittest
class VarSizeTest(unittest.TestCase):

View File

@ -1,11 +1,13 @@
# Windows specific tests
import _ctypes_test
import ctypes
from ctypes import *
import unittest, sys
import sys
import unittest
from ctypes import (CDLL, Structure, POINTER, pointer, sizeof, byref,
c_void_p, c_char, c_int, c_long)
from test import support
import _ctypes_test
@unittest.skipUnless(sys.platform == "win32", 'Windows-specific test')
class FunctionCallTestCase(unittest.TestCase):
@ -94,6 +96,7 @@ class TestWinError(unittest.TestCase):
self.assertEqual(e.errno, errno.EINVAL)
self.assertEqual(e.winerror, ERROR_INVALID_PARAMETER)
class Structures(unittest.TestCase):
def test_struct_by_value(self):
class POINT(Structure):
@ -136,5 +139,6 @@ class Structures(unittest.TestCase):
from ctypes import _pointer_type_cache
del _pointer_type_cache[RECT]
if __name__ == '__main__':
unittest.main()

View File

@ -5,7 +5,7 @@ import unittest
# also work on POSIX
from ctypes import *
from ctypes import POINTER, cast, c_int16
from ctypes import wintypes