From 9435dd7565d47d6d540f4c148175c958bcc6d9ed Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Sat, 22 Nov 2025 14:04:34 +0100 Subject: [PATCH 01/17] Additional minor code updates Follow-up of 8919eff. --- src/cffi/api.py | 3 +-- src/cffi/recompiler.py | 4 +--- src/cffi/vengine_gen.py | 3 +-- testing/cffi1/test_ffi_obj.py | 3 +-- testing/cffi1/test_re_python.py | 3 +-- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/cffi/api.py b/src/cffi/api.py index 906489d3..a1fb69f2 100644 --- a/src/cffi/api.py +++ b/src/cffi/api.py @@ -620,8 +620,7 @@ def set_source(self, module_name, source, source_extension='.c', **kwds): if os.sep in module_name or (os.altsep and os.altsep in module_name): raise ValueError("'module_name' must not contain '/': use a dotted " "name to make a 'package.module' location") - self._assigned_source = (str(module_name), source, - source_extension, kwds) + self._assigned_source = (module_name, source, source_extension, kwds) def set_source_pkgconfig(self, module_name, pkgconfig_libs, source, source_extension='.c', **kwds): diff --git a/src/cffi/recompiler.py b/src/cffi/recompiler.py index 1d2bcdd5..96f52a39 100644 --- a/src/cffi/recompiler.py +++ b/src/cffi/recompiler.py @@ -7,7 +7,6 @@ VERSION_EMBEDDED = 0x2701 VERSION_CHAR16CHAR32 = 0x2801 - class GlobalExpr: def __init__(self, name, address, type_op, size=0, check_value=0): self.name = name @@ -1281,9 +1280,8 @@ def _print_string_literal_in_array(self, s): else: s.decode('utf-8') # got bytes, check for valid utf-8 for line in s.splitlines(True): - comment = line # type(line) is bytes, which enumerates like a list of integers - comment = ascii(comment)[1:-1] + comment = ascii(line)[1:-1] prnt(('// ' + comment).rstrip()) printed_line = '' for c in line: diff --git a/src/cffi/vengine_gen.py b/src/cffi/vengine_gen.py index d1166415..db4c474e 100644 --- a/src/cffi/vengine_gen.py +++ b/src/cffi/vengine_gen.py @@ -489,8 +489,7 @@ def _load_known_int_constant(self, module, funcname): function = module.load_function(BFunc, funcname) p = self.ffi.new(BType, 256) if function(p) < 0: - error = self.ffi.string(p) - error = str(error, 'utf-8') + error = str(self.ffi.string(p), 'utf-8') raise VerificationError(error) def _enum_funcname(self, prefix, name): diff --git a/testing/cffi1/test_ffi_obj.py b/testing/cffi1/test_ffi_obj.py index 011bc17b..78c57df9 100644 --- a/testing/cffi1/test_ffi_obj.py +++ b/testing/cffi1/test_ffi_obj.py @@ -226,9 +226,8 @@ def test_ffi_invalid_type(): "struct never_heard_of_s\n" " ^") e = pytest.raises(ffi.error, ffi.cast, "\t\n\x01\x1f~\x7f\x80\xff", 0) - marks = "??" assert str(e.value) == ("identifier expected\n" - f" ??~?{marks}{marks}\n" + " ??~?????\n" " ^") e = pytest.raises(ffi.error, ffi.cast, "X" * 600, 0) assert str(e.value) == ("undefined type name") diff --git a/testing/cffi1/test_re_python.py b/testing/cffi1/test_re_python.py index 49d8c9d6..77439ed8 100644 --- a/testing/cffi1/test_re_python.py +++ b/testing/cffi1/test_re_python.py @@ -133,8 +133,7 @@ def test_dlclose(): lib = ffi.dlopen(extmod) ffi.dlclose(lib) e = pytest.raises(ffi.error, getattr, lib, 'add42') - assert str(e.value) == ( - f"library '{extmod}' has been closed") + assert str(e.value) == f"library '{extmod}' has been closed" ffi.dlclose(lib) # does not raise @pytest.mark.thread_unsafe( From c7e9a0e823da7633ac1cc125dcbb90e01cc547bf Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Wed, 18 Nov 2026 14:40:58 +0100 Subject: [PATCH 02/17] Apply ruff/flake8-comprehensions rule C401 Unnecessary generator (rewrite as a set comprehension) --- testing/cffi1/test_new_ffi_1.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/cffi1/test_new_ffi_1.py b/testing/cffi1/test_new_ffi_1.py index e02c4224..9983a5a9 100644 --- a/testing/cffi1/test_new_ffi_1.py +++ b/testing/cffi1/test_new_ffi_1.py @@ -1793,7 +1793,7 @@ def test_import_from_lib(self): from _test_import_from_lib.lib import bar d = {} exec("from _test_import_from_lib.lib import *", d) - assert (set(key for key in d if not key.startswith('_')) == + assert ({key for key in d if not key.startswith('_')} == set(['myfunc', 'MYFOO'])) # # also test "import *" on the module itself, which should be From 822c644b952425cdb895b57f5698d288f885bfe5 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Wed, 18 Nov 2026 14:43:58 +0100 Subject: [PATCH 03/17] Apply ruff/flake8-comprehensions rule C404 Unnecessary list comprehension (rewrite as a dict comprehension) --- src/cffi/cffi_opcode.py | 6 +++--- src/cffi/recompiler.py | 4 ++-- src/cffi/vengine_cpy.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/cffi/cffi_opcode.py b/src/cffi/cffi_opcode.py index 7cb8ee82..50febc8d 100644 --- a/src/cffi/cffi_opcode.py +++ b/src/cffi/cffi_opcode.py @@ -172,9 +172,9 @@ def format_four_bytes(num): F_EXTERNAL = 0x08 F_OPAQUE = 0x10 -G_FLAGS = dict([('_CFFI_' + _key, globals()[_key]) - for _key in ['F_UNION', 'F_CHECK_FIELDS', 'F_PACKED', - 'F_EXTERNAL', 'F_OPAQUE']]) +G_FLAGS = {'_CFFI_' + _key: globals()[_key] + for _key in ['F_UNION', 'F_CHECK_FIELDS', 'F_PACKED', + 'F_EXTERNAL', 'F_OPAQUE']} CLASS_NAME = {} for _name, _value in list(globals().items()): diff --git a/src/cffi/recompiler.py b/src/cffi/recompiler.py index 96f52a39..17867cb2 100644 --- a/src/cffi/recompiler.py +++ b/src/cffi/recompiler.py @@ -330,7 +330,7 @@ def write_c_source_to_f(self, f, preamble): # # the declaration of '_cffi_types' prnt('static void *_cffi_types[] = {') - typeindex2type = dict([(i, tp) for (tp, i) in self._typesdict.items()]) + typeindex2type = {i: tp for (tp, i) in self._typesdict.items()} for i, op in enumerate(self.cffi_types): comment = '' if i in typeindex2type: @@ -482,7 +482,7 @@ def write_py_source_to_f(self, f): self.cffi_types = tuple(self.cffi_types) # don't change any more types_lst = [op.as_python_bytes() for op in self.cffi_types] prnt(' _types = {},'.format(self._to_py(''.join(types_lst)))) - typeindex2type = dict([(i, tp) for (tp, i) in self._typesdict.items()]) + typeindex2type = {i: tp for (tp, i) in self._typesdict.items()} # # the keyword arguments from ALL_STEPS for step_name in self.ALL_STEPS: diff --git a/src/cffi/vengine_cpy.py b/src/cffi/vengine_cpy.py index 0c38e951..34e6eb5e 100644 --- a/src/cffi/vengine_cpy.py +++ b/src/cffi/vengine_cpy.py @@ -156,8 +156,8 @@ def load_library(self, flags=None): # # the C code will need the objects. Collect them in # order in a list. - revmapping = dict([(value, key) - for (key, value) in self._typesdict.items()]) + revmapping = {value: key + for (key, value) in self._typesdict.items()} lst = [revmapping[i] for i in range(len(revmapping))] lst = list(map(self.ffi._get_cached_btype, lst)) # From a293402725a9eba07f2f76718defdc2b155a8cbd Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Wed, 18 Nov 2026 14:44:52 +0100 Subject: [PATCH 04/17] Apply ruff/flake8-comprehensions rule C405 Unnecessary list literal (rewrite as a set literal) --- testing/cffi1/test_new_ffi_1.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/cffi1/test_new_ffi_1.py b/testing/cffi1/test_new_ffi_1.py index 9983a5a9..62c8f0bc 100644 --- a/testing/cffi1/test_new_ffi_1.py +++ b/testing/cffi1/test_new_ffi_1.py @@ -1703,7 +1703,7 @@ def test_struct_array_no_length(self): pytest.raises(TypeError, list, q.a) def test_all_primitives(self): - assert set(PRIMITIVE_TO_INDEX) == set([ + assert set(PRIMITIVE_TO_INDEX) == { "char", "short", "int", @@ -1755,7 +1755,7 @@ def test_all_primitives(self): "ssize_t", '_cffi_float_complex_t', '_cffi_double_complex_t', - ]) + } for name in PRIMITIVE_TO_INDEX: x = ffi.sizeof(name) assert 1 <= x <= 16 @@ -1794,7 +1794,7 @@ def test_import_from_lib(self): d = {} exec("from _test_import_from_lib.lib import *", d) assert ({key for key in d if not key.startswith('_')} == - set(['myfunc', 'MYFOO'])) + {'myfunc', 'MYFOO'}) # # also test "import *" on the module itself, which should be # equivalent to "import ffi, lib" From 1f525b1a418e342d4b089a49c74bed8543088d0f Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Wed, 18 Nov 2026 14:45:43 +0100 Subject: [PATCH 05/17] Apply ruff/flake8-comprehensions rule C410 Unnecessary tuple literal passed to `list()` (rewrite as a single list literal) --- src/c/test_c.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/c/test_c.py b/src/c/test_c.py index a2e3debc..2861ad32 100644 --- a/src/c/test_c.py +++ b/src/c/test_c.py @@ -3244,8 +3244,8 @@ class mylist(list): del o import gc; gc.collect() assert wr() is not None - assert from_handle(x) == list((2, 3, 4)) - assert from_handle(cast(BCharP, x)) == list((2, 3, 4)) + assert from_handle(x) == [2, 3, 4] + assert from_handle(cast(BCharP, x)) == [2, 3, 4] del x for i in range(3): if wr() is not None: From adf7b5667cd3e21d1cade6d3e93ac5f08d07b72f Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Wed, 18 Nov 2026 14:48:35 +0100 Subject: [PATCH 06/17] Apply ruff/flake8-implicit-str-concat rule ISC004 Unparenthesized implicit string concatenation in collection --- testing/cffi1/test_cffi_gen_src_meson.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/cffi1/test_cffi_gen_src_meson.py b/testing/cffi1/test_cffi_gen_src_meson.py index c32b3664..b4b26ab4 100644 --- a/testing/cffi1/test_cffi_gen_src_meson.py +++ b/testing/cffi1/test_cffi_gen_src_meson.py @@ -78,7 +78,7 @@ def test_meson_python_build(tmp_path, project): # Confirm the built extension imports and behaves as expected. subprocess.check_call([ str(venv_python), "-c", - "from squared import squared; " - "assert squared(7) == 49; " - "assert squared(-3) == 9", + ("from squared import squared; " + "assert squared(7) == 49; " + "assert squared(-3) == 9"), ]) From a1cd4a53e97815ef13d2c73f7d00c47dde8fb235 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Wed, 18 Nov 2026 14:50:22 +0100 Subject: [PATCH 07/17] Apply ruff/flake8-return rule RET501 Do not explicitly `return None` in function if it is the only possible return value --- demo/_curses.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/demo/_curses.py b/demo/_curses.py index 210fa848..14722c29 100644 --- a/demo/_curses.py +++ b/demo/_curses.py @@ -93,7 +93,7 @@ def _ensure_initialised_color(): def _check_ERR(code, fname): if code != lib.ERR: - return None + return elif fname is None: raise error("curses function returned ERR") else: @@ -799,7 +799,7 @@ def setupterm(term=None, fd=-1): fd = sys.stdout.fileno() if _initialised_setupterm: - return None + return if term is None: term = ffi.NULL @@ -814,7 +814,7 @@ def setupterm(term=None, fd=-1): raise error("setupterm: unknown error") globals()["_initialised_setupterm"] = True - return None + return def intrflush(ch): From d4e524abe380d9666a9504717d74e37610589146 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Wed, 18 Nov 2026 15:06:16 +0100 Subject: [PATCH 08/17] Apply ruff/flake8-simplify rule SIM102 Use a single `if` statement instead of nested `if` statements --- .../actions/dynamatrix/matrix_yaml_to_json.py | 11 +++++----- src/cffi/backend_ctypes.py | 20 +++++++++---------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/actions/dynamatrix/matrix_yaml_to_json.py b/.github/actions/dynamatrix/matrix_yaml_to_json.py index 77bebaf4..8ff0492b 100644 --- a/.github/actions/dynamatrix/matrix_yaml_to_json.py +++ b/.github/actions/dynamatrix/matrix_yaml_to_json.py @@ -14,11 +14,12 @@ def _filter_omit_entries(value): if isinstance(value, MutableMapping): - if (omit_value := value.pop('omit', ...)) is not ...: - if omit_value is True or str(omit_value).lower().strip() == 'true': - print(f'omitting {value} from matrix') - skipped_entries.append(value) - return ... + omit_value = value.pop('omit', ...) + if omit_value is not ... and ( + omit_value is True or str(omit_value).lower().strip() == 'true'): + print(f'omitting {value} from matrix') + skipped_entries.append(value) + return ... return {k: v for k, v in ((k, _filter_omit_entries(v)) for k, v in value.items()) if v is not ...} diff --git a/src/cffi/backend_ctypes.py b/src/cffi/backend_ctypes.py index a4222233..5dedce80 100644 --- a/src/cffi/backend_ctypes.py +++ b/src/cffi/backend_ctypes.py @@ -615,12 +615,11 @@ def __init__(self, init): def _initialize(blob, init): if isinstance(init, bytes): init = [init[i:i+1] for i in range(len(init))] - else: - if isinstance(init, CTypesGenericArray): - if (len(init) != len(blob) or - not isinstance(init, CTypesArray)): - raise TypeError(f"length/type mismatch: {init}") - init = tuple(init) + elif isinstance(init, CTypesGenericArray): + if (len(init) != len(blob) or + not isinstance(init, CTypesArray)): + raise TypeError(f"length/type mismatch: {init}") + init = tuple(init) if len(init) > len(blob): raise IndexError("too many initializers") addr = ctypes.cast(blob, ctypes.c_void_p).value @@ -749,11 +748,10 @@ def _create_ctype_obj(init): CTypesStructOrUnion._create_ctype_obj = _create_ctype_obj # def initialize(blob, init): - if is_union: - if len(init) > 1: - raise ValueError("union initializer: %d items given, but " - "only one supported (use a dict if needed)" - % (len(init),)) + if is_union and len(init) > 1: + raise ValueError("union initializer: %d items given, but " + "only one supported (use a dict if needed)" + % (len(init),)) if not isinstance(init, dict): if isinstance(init, (bytes, str)): raise TypeError("union initializer: got a str") From ee8aa237295d8bebec57b6b3ec38fda6bec2a4f9 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Wed, 18 Nov 2026 15:07:54 +0100 Subject: [PATCH 09/17] Apply ruff/flake8-simplify rule SIM117 Use a single `with` statement with multiple contexts instead of nested `with` statements --- src/c/test_c.py | 10 ++++------ src/cffi/api.py | 13 ++++++------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/c/test_c.py b/src/c/test_c.py index 2861ad32..0164b626 100644 --- a/src/c/test_c.py +++ b/src/c/test_c.py @@ -4311,12 +4311,10 @@ def test_explicit_release_badtype(): def test_explicit_release_badtype_contextmgr(): BIntP = new_pointer_type(new_primitive_type("int")) p = cast(BIntP, 12345) - with pytest.raises(ValueError): - with p: - pass - with pytest.raises(ValueError): - with p: - pass + with pytest.raises(ValueError), p: + pass + with pytest.raises(ValueError), p: + pass def test_explicit_release_gc(): BIntP = new_pointer_type(new_primitive_type("int")) diff --git a/src/cffi/api.py b/src/cffi/api.py index a1fb69f2..64cbe3c1 100644 --- a/src/cffi/api.py +++ b/src/cffi/api.py @@ -511,13 +511,12 @@ def include(self, ffi_to_include): f" type cffi.FFI, not {type(ffi_to_include).__name__!r}") if ffi_to_include is self: raise ValueError("self.include(self)") - with ffi_to_include._lock: - with self._lock: - self._parser.include(ffi_to_include._parser) - self._cdefsources.append('[') - self._cdefsources.extend(ffi_to_include._cdefsources) - self._cdefsources.append(']') - self._included_ffis.append(ffi_to_include) + with ffi_to_include._lock, self._lock: + self._parser.include(ffi_to_include._parser) + self._cdefsources.append('[') + self._cdefsources.extend(ffi_to_include._cdefsources) + self._cdefsources.append(']') + self._included_ffis.append(ffi_to_include) def new_handle(self, x): return self._backend.newp_handle(self.BVoidP, x) From 9275c1ccfe0a1a55019a3c166629480048353735 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Wed, 18 Nov 2026 12:58:56 +0100 Subject: [PATCH 10/17] Apply ruff/isort rule I001 Import block is un-sorted or un-formatted --- .../actions/dynamatrix/matrix_yaml_to_json.py | 4 +-- demo/_curses_build.py | 1 + demo/api.py | 1 + demo/bsdopendirtype.py | 1 + demo/extern_python.py | 1 + demo/extern_python_varargs.py | 1 + demo/fastcsv.py | 1 + demo/gmp.py | 1 + demo/pwuid.py | 4 +-- demo/pwuid_build.py | 1 + demo/readdir.py | 1 + demo/readdir2_setup.py | 1 + demo/readdir_build.py | 1 + demo/readdir_ctypes.py | 2 +- demo/recopendirtype.py | 1 + demo/recopendirtype_build.py | 3 +- demo/setup_manual.py | 1 + demo/winclipboard.py | 3 +- demo/xclient.py | 4 +-- demo/xclient_build.py | 1 + doc/source/conf.py | 3 +- setup.py | 10 +++--- setup_base.py | 16 +++++++--- src/c/test_c.py | 13 +++++--- src/cffi/__init__.py | 13 +++++--- src/cffi/_imp_emulation.py | 9 ++---- src/cffi/_shimmed_dist_utils.py | 2 +- src/cffi/api.py | 10 ++++-- src/cffi/backend_ctypes.py | 7 +++- src/cffi/cffi_opcode.py | 1 + src/cffi/commontypes.py | 2 +- src/cffi/cparser.py | 9 ++++-- src/cffi/ffiplatform.py | 14 ++++++-- src/cffi/lock.py | 1 - src/cffi/model.py | 2 +- src/cffi/pkgconfig.py | 4 ++- src/cffi/recompiler.py | 7 ++-- src/cffi/setuptools_ext.py | 9 ++++-- src/cffi/vengine_cpy.py | 3 +- src/cffi/verifier.py | 13 +++++--- testing/cffi0/backend_tests.py | 18 ++++++++--- testing/cffi0/callback_in_thread.py | 5 ++- .../cffi0/snippets/distutils_module/setup.py | 1 + .../distutils_module/snip_basic_verify.py | 3 +- .../snippets/distutils_package_1/setup.py | 1 + .../snip_basic_verify1/__init__.py | 3 +- .../snippets/distutils_package_2/setup.py | 1 + .../snip_basic_verify2/__init__.py | 3 +- .../cffi0/snippets/setuptools_module/setup.py | 2 +- .../snip_setuptools_verify.py | 3 +- .../snippets/setuptools_package_1/setup.py | 2 +- .../snip_setuptools_verify1/__init__.py | 3 +- .../snippets/setuptools_package_2/setup.py | 2 +- .../snip_setuptools_verify2/__init__.py | 3 +- testing/cffi0/test_cdata.py | 1 + testing/cffi0/test_ctypes.py | 4 ++- testing/cffi0/test_ffi_backend.py | 15 ++++++--- testing/cffi0/test_function.py | 11 +++++-- testing/cffi0/test_ownlib.py | 9 ++++-- testing/cffi0/test_parsing.py | 10 ++++-- testing/cffi0/test_platform.py | 4 ++- testing/cffi0/test_unicode_literals.py | 8 +++-- testing/cffi0/test_verify.py | 26 +++++++++++---- testing/cffi0/test_version.py | 11 +++++-- testing/cffi0/test_vgen.py | 1 + testing/cffi0/test_zdistutils.py | 11 +++++-- testing/cffi0/test_zintegration.py | 10 ++++-- testing/cffi1/test_cffi_binary.py | 8 +++-- testing/cffi1/test_cffi_gen_src_meson.py | 1 - testing/cffi1/test_commontypes.py | 8 +++-- testing/cffi1/test_dlopen.py | 3 +- testing/cffi1/test_ffi_obj.py | 6 ++-- testing/cffi1/test_function_args.py | 17 +++++++--- testing/cffi1/test_new_ffi_1.py | 24 +++++++++----- testing/cffi1/test_parse_c_type.py | 8 +++-- testing/cffi1/test_pkgconfig.py | 7 ++-- testing/cffi1/test_re_python.py | 10 +++--- testing/cffi1/test_realize_c_type.py | 2 ++ testing/cffi1/test_recompiler.py | 10 +++--- testing/cffi1/test_verify1.py | 32 ++++++++++++++----- testing/cffi1/test_zdist.py | 11 ++++--- testing/conftest.py | 10 +++--- testing/embedding/__init__.py | 1 + testing/embedding/test_basic.py | 13 +++++--- testing/embedding/test_performance.py | 1 + testing/embedding/withunicode.py | 3 +- testing/support.py | 9 ++++-- testing/udir.py | 6 +++- 88 files changed, 374 insertions(+), 169 deletions(-) diff --git a/.github/actions/dynamatrix/matrix_yaml_to_json.py b/.github/actions/dynamatrix/matrix_yaml_to_json.py index 8ff0492b..9839841e 100644 --- a/.github/actions/dynamatrix/matrix_yaml_to_json.py +++ b/.github/actions/dynamatrix/matrix_yaml_to_json.py @@ -6,10 +6,10 @@ import pathlib import sys import typing as t -import yaml - from collections.abc import MutableMapping, Sequence +import yaml + skipped_entries = [] def _filter_omit_entries(value): diff --git a/demo/_curses_build.py b/demo/_curses_build.py index 1a1a3ecb..5dd1a064 100644 --- a/demo/_curses_build.py +++ b/demo/_curses_build.py @@ -1,4 +1,5 @@ import sys + if sys.platform == 'win32': #This module does not exist in windows raise ImportError('No module named _curses') diff --git a/demo/api.py b/demo/api.py index 86935aec..63995ce1 100644 --- a/demo/api.py +++ b/demo/api.py @@ -1,6 +1,7 @@ import cffi from cffi import FFI + class PythonFFI(FFI): def __init__(self, backend=None): diff --git a/demo/bsdopendirtype.py b/demo/bsdopendirtype.py index 6bfdd3ab..d2fff0b1 100644 --- a/demo/bsdopendirtype.py +++ b/demo/bsdopendirtype.py @@ -1,4 +1,5 @@ import os + from _bsdopendirtype import ffi, lib diff --git a/demo/extern_python.py b/demo/extern_python.py index f315cc54..fc6dc196 100644 --- a/demo/extern_python.py +++ b/demo/extern_python.py @@ -19,6 +19,7 @@ from _extern_python_cffi import ffi, lib + @ffi.def_extern() def f(n): return n * n diff --git a/demo/extern_python_varargs.py b/demo/extern_python_varargs.py index 79fee0e3..fb8c0bf2 100644 --- a/demo/extern_python_varargs.py +++ b/demo/extern_python_varargs.py @@ -40,6 +40,7 @@ from _extern_python_cffi import ffi, lib + @ffi.def_extern() def f(n, va): if n == 3: diff --git a/demo/fastcsv.py b/demo/fastcsv.py index 8e28a57e..13fbdda6 100644 --- a/demo/fastcsv.py +++ b/demo/fastcsv.py @@ -1,4 +1,5 @@ import csv + import cffi # IN-PROGRESS. See the demo at the end of the file diff --git a/demo/gmp.py b/demo/gmp.py index 2e26f61f..6c467eea 100644 --- a/demo/gmp.py +++ b/demo/gmp.py @@ -1,4 +1,5 @@ import sys + # # This is only a demo based on the GMP library. # There is a rather more complete (but perhaps outdated) version available at: diff --git a/demo/pwuid.py b/demo/pwuid.py index 2ecb4b84..86f83823 100644 --- a/demo/pwuid.py +++ b/demo/pwuid.py @@ -1,7 +1,7 @@ -import sys, os +import os +import sys # run pwuid_build first, then make sure the shared object is on sys.path from _pwuid_cffi import ffi, lib - print(ffi.string(lib.getpwuid(0).pw_name)) diff --git a/demo/pwuid_build.py b/demo/pwuid_build.py index 7ef0d76f..1b53ded1 100644 --- a/demo/pwuid_build.py +++ b/demo/pwuid_build.py @@ -1,4 +1,5 @@ from cffi import FFI + ffi = FFI() ffi.cdef(""" // some declarations from the man page struct passwd { diff --git a/demo/readdir.py b/demo/readdir.py index 77e39a5b..1afc5adb 100644 --- a/demo/readdir.py +++ b/demo/readdir.py @@ -6,6 +6,7 @@ raise Exception("Linux-only demo") from _readdir import ffi + lib = ffi.dlopen(None) diff --git a/demo/readdir2_setup.py b/demo/readdir2_setup.py index bd8c19f4..dac647b7 100644 --- a/demo/readdir2_setup.py +++ b/demo/readdir2_setup.py @@ -1,4 +1,5 @@ from distutils.core import setup + import readdir2_build setup( diff --git a/demo/readdir_build.py b/demo/readdir_build.py index f97f404b..8b47f2ce 100644 --- a/demo/readdir_build.py +++ b/demo/readdir_build.py @@ -1,4 +1,5 @@ import sys + from cffi import FFI if not sys.platform.startswith('linux'): diff --git a/demo/readdir_ctypes.py b/demo/readdir_ctypes.py index 39025f54..c5a6f26c 100644 --- a/demo/readdir_ctypes.py +++ b/demo/readdir_ctypes.py @@ -1,8 +1,8 @@ # A Linux-only demo # # For comparison purposes, this is a ctypes version of readdir.py. -import sys import ctypes +import sys if not sys.platform.startswith('linux'): raise Exception("Linux-only demo") diff --git a/demo/recopendirtype.py b/demo/recopendirtype.py index aff3ce9a..d358cc3d 100644 --- a/demo/recopendirtype.py +++ b/demo/recopendirtype.py @@ -1,4 +1,5 @@ import os + from _recopendirtype import ffi, lib diff --git a/demo/recopendirtype_build.py b/demo/recopendirtype_build.py index fa62a054..66963621 100644 --- a/demo/recopendirtype_build.py +++ b/demo/recopendirtype_build.py @@ -1,6 +1,7 @@ -from cffi import FFI import bsdopendirtype_build +from cffi import FFI + ffi = FFI() # ========== This is a demo of ffi.include() ========== diff --git a/demo/setup_manual.py b/demo/setup_manual.py index 2569bb4a..2eddf24c 100644 --- a/demo/setup_manual.py +++ b/demo/setup_manual.py @@ -1,5 +1,6 @@ from distutils.core import setup from distutils.extension import Extension + setup(name='manual', ext_modules=[Extension(name='manual', sources=['manual.c'])]) diff --git a/demo/winclipboard.py b/demo/winclipboard.py index c9e64d71..8425d23b 100644 --- a/demo/winclipboard.py +++ b/demo/winclipboard.py @@ -1,6 +1,7 @@ __author__ = "Israel Fruchter " -import sys, os +import os +import sys if not sys.platform == 'win32': raise Exception("Windows-only demo") diff --git a/demo/xclient.py b/demo/xclient.py index e4b3dd2d..3864ad6c 100644 --- a/demo/xclient.py +++ b/demo/xclient.py @@ -1,9 +1,9 @@ -import sys, os +import os +import sys # run xclient_build first, then make sure the shared object is on sys.path from _xclient_cffi import ffi, lib - # ffi "knows" about the declared variables and functions from the # cdef parts of the module xclient_build created, # lib "knows" how to call the functions from the set_source parts diff --git a/demo/xclient_build.py b/demo/xclient_build.py index d6ce9da1..24667c89 100644 --- a/demo/xclient_build.py +++ b/demo/xclient_build.py @@ -1,4 +1,5 @@ from cffi import FFI + ffi = FFI() ffi.cdef(""" diff --git a/doc/source/conf.py b/doc/source/conf.py index 837c719b..4cf87f5e 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -9,7 +9,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os +import os +import sys # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the diff --git a/setup.py b/setup.py index 50b487ea..de8eae54 100644 --- a/setup.py +++ b/setup.py @@ -1,12 +1,14 @@ -import sys, sysconfig, os, platform -import subprocess import errno +import os +import platform +import subprocess +import sys +import sysconfig # the setuptools distutils shim should make distutils available, but this will definitely do # it, since setuptools is now required at build-time import setuptools - sources = ['src/c/_cffi_backend.c'] libraries = ['ffi'] include_dirs = ['/usr/include/ffi', @@ -168,7 +170,7 @@ def use_homebrew_for_libffi(): if __name__ == '__main__': - from setuptools import setup, Distribution, Extension + from setuptools import Distribution, Extension, setup class CFFIDistribution(Distribution): def has_ext_modules(self): diff --git a/setup_base.py b/setup_base.py index 4cf6ea5c..873834d6 100644 --- a/setup_base.py +++ b/setup_base.py @@ -1,9 +1,15 @@ -import sys, os - - -from setup import include_dirs, sources, libraries, define_macros -from setup import library_dirs, extra_compile_args, extra_link_args +import os +import sys +from setup import ( + define_macros, + extra_compile_args, + extra_link_args, + include_dirs, + libraries, + library_dirs, + sources, +) if __name__ == '__main__': from distutils.core import setup diff --git a/src/c/test_c.py b/src/c/test_c.py index 0164b626..e2ddc19b 100644 --- a/src/c/test_c.py +++ b/src/c/test_c.py @@ -2,12 +2,12 @@ import contextlib import os +import sys import traceback +import typing as t import unittest.mock import pytest -import sys -import typing as t is_musl = False if sys.platform == 'linux': @@ -22,11 +22,13 @@ def _setup_path(): - import os, sys + import os + import sys sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) _setup_path() from _cffi_backend import * -from _cffi_backend import _get_types, _get_common_types +from _cffi_backend import _get_common_types, _get_types + try: from _cffi_backend import _testfunc except ImportError: @@ -67,6 +69,7 @@ def _capture_unraisable_hook(ur_args): # ____________________________________________________________ import sys + assert __version__ == "2.2.0.dev0", ("This test_c.py file is for testing a version" " of cffi that differs from the one that we" " get from 'import _cffi_backend'") @@ -3254,8 +3257,8 @@ class mylist(list): pytest.raises(RuntimeError, from_handle, cast(BCharP, 0)) def test_new_handle_cycle(): - import gc import _weakref + import gc BVoidP = new_pointer_type(new_void_type()) class A: pass diff --git a/src/cffi/__init__.py b/src/cffi/__init__.py index 296dbb81..dd4ede4a 100644 --- a/src/cffi/__init__.py +++ b/src/cffi/__init__.py @@ -1,9 +1,14 @@ -__all__ = ['FFI', 'VerificationError', 'VerificationMissing', 'CDefError', - 'FFIError'] +__all__ = ['FFI', 'CDefError','FFIError', + 'VerificationError', 'VerificationMissing'] from .api import FFI -from .error import CDefError, FFIError, VerificationError, VerificationMissing -from .error import PkgConfigError +from .error import ( + CDefError, + FFIError, + PkgConfigError, + VerificationError, + VerificationMissing, +) __version__ = "2.2.0.dev0" __version_info__ = (2, 2, 0, 'dev0') diff --git a/src/cffi/_imp_emulation.py b/src/cffi/_imp_emulation.py index 65b0bc6b..59f99641 100644 --- a/src/cffi/_imp_emulation.py +++ b/src/cffi/_imp_emulation.py @@ -8,15 +8,12 @@ # Note that this is used only for tests or for the old ffi.verify(). # This is copied from the source code of Python 3.11. - from _imp import (acquire_lock, release_lock, - is_builtin, is_frozen) - - from importlib._bootstrap import _load - - from importlib import machinery import os import sys import tokenize + from _imp import acquire_lock, is_builtin, is_frozen, release_lock + from importlib import machinery + from importlib._bootstrap import _load SEARCH_ERROR = 0 PY_SOURCE = 1 diff --git a/src/cffi/_shimmed_dist_utils.py b/src/cffi/_shimmed_dist_utils.py index c3d23128..b4a065e0 100644 --- a/src/cffi/_shimmed_dist_utils.py +++ b/src/cffi/_shimmed_dist_utils.py @@ -26,7 +26,7 @@ from distutils.command.build_ext import build_ext from distutils.core import Distribution, Extension from distutils.dir_util import mkpath - from distutils.errors import DistutilsSetupError, CompileError, LinkError + from distutils.errors import CompileError, DistutilsSetupError, LinkError from distutils.log import set_threshold, set_verbosity if sys.platform == 'win32': diff --git a/src/cffi/api.py b/src/cffi/api.py index 64cbe3c1..cbf8dcbd 100644 --- a/src/cffi/api.py +++ b/src/cffi/api.py @@ -1,7 +1,9 @@ -import sys, types -from .lock import allocate_lock -from .error import CDefError +import sys +import types + from . import model +from .error import CDefError +from .lock import allocate_lock _unspecified = object() @@ -32,6 +34,7 @@ def __init__(self, backend=None): if backend is None: # You need PyPy or a CPython with _cffi_backend.so compiled. import _cffi_backend as backend + from . import __version__ if backend.__version__ != __version__: # bad version! Try to be as explicit as possible. @@ -633,6 +636,7 @@ def set_source_pkgconfig(self, module_name, pkgconfig_libs, source, def distutils_extension(self, tmpdir='build', verbose=True): from cffi._shimmed_dist_utils import mkpath + from .recompiler import recompile # if not hasattr(self, '_assigned_source'): diff --git a/src/cffi/backend_ctypes.py b/src/cffi/backend_ctypes.py index 5dedce80..04bb5eb3 100644 --- a/src/cffi/backend_ctypes.py +++ b/src/cffi/backend_ctypes.py @@ -1,6 +1,11 @@ -import ctypes, ctypes.util, operator, sys +import ctypes +import ctypes.util +import operator +import sys + from . import model + class CTypesType(type): pass diff --git a/src/cffi/cffi_opcode.py b/src/cffi/cffi_opcode.py index 50febc8d..7fa6505d 100644 --- a/src/cffi/cffi_opcode.py +++ b/src/cffi/cffi_opcode.py @@ -1,5 +1,6 @@ from .error import VerificationError + class CffiOp: def __init__(self, op, arg): self.op = op diff --git a/src/cffi/commontypes.py b/src/cffi/commontypes.py index 8d77068d..431d29db 100644 --- a/src/cffi/commontypes.py +++ b/src/cffi/commontypes.py @@ -1,8 +1,8 @@ import sys + from . import model from .error import FFIError - COMMON_TYPES = {} try: diff --git a/src/cffi/cparser.py b/src/cffi/cparser.py index f36e1ac6..deb2c703 100644 --- a/src/cffi/cparser.py +++ b/src/cffi/cparser.py @@ -1,11 +1,14 @@ from . import model from .commontypes import COMMON_TYPES, resolve_common_type -from .error import FFIError, CDefError +from .error import CDefError, FFIError + try: from . import _pycparser as pycparser except ImportError: import pycparser -import weakref, re, sys +import re +import sys +import weakref try: import _thread @@ -17,8 +20,8 @@ def _workaround_for_static_import_finders(): # Issue #392: packaging tools like cx_Freeze can not find these # because pycparser uses exec dynamic import. This is an obscure # workaround. This function is never called. - import pycparser.yacctab import pycparser.lextab + import pycparser.yacctab CDEF_SOURCE_STRING = "" _r_comment = re.compile(r"/\*.*?\*/|//([^\n\\]|\\.)*?$", diff --git a/src/cffi/ffiplatform.py b/src/cffi/ffiplatform.py index 4fb9e509..558f2c62 100644 --- a/src/cffi/ffiplatform.py +++ b/src/cffi/ffiplatform.py @@ -1,6 +1,8 @@ -import sys, os, io -from .error import VerificationError +import io +import os +import sys +from .error import VerificationError LIST_OF_FILE_NAMES = ['sources', 'include_dirs', 'library_dirs', 'extra_objects', 'depends'] @@ -29,7 +31,13 @@ def compile(tmpdir, ext, compiler_verbose=0, debug=None): def _build(tmpdir, ext, compiler_verbose=0, debug=None): # XXX compact but horrible :-( - from cffi._shimmed_dist_utils import Distribution, CompileError, LinkError, set_threshold, set_verbosity + from cffi._shimmed_dist_utils import ( + CompileError, + Distribution, + LinkError, + set_threshold, + set_verbosity, + ) dist = Distribution({'ext_modules': [ext]}) dist.parse_config_files() diff --git a/src/cffi/lock.py b/src/cffi/lock.py index e2b3c47c..dafb3462 100644 --- a/src/cffi/lock.py +++ b/src/cffi/lock.py @@ -1,5 +1,4 @@ import sys - from _thread import allocate_lock diff --git a/src/cffi/model.py b/src/cffi/model.py index d12424c7..35a9c393 100644 --- a/src/cffi/model.py +++ b/src/cffi/model.py @@ -1,8 +1,8 @@ import types import weakref -from .lock import allocate_lock from .error import CDefError, VerificationError, VerificationMissing +from .lock import allocate_lock # type qualifiers Q_CONST = 0x01 diff --git a/src/cffi/pkgconfig.py b/src/cffi/pkgconfig.py index 6108196d..cfb04802 100644 --- a/src/cffi/pkgconfig.py +++ b/src/cffi/pkgconfig.py @@ -1,5 +1,7 @@ # pkg-config, https://www.freedesktop.org/wiki/Software/pkg-config/ integration for cffi -import sys, os, subprocess +import os +import subprocess +import sys from .error import PkgConfigError diff --git a/src/cffi/recompiler.py b/src/cffi/recompiler.py index 17867cb2..9aa315fc 100644 --- a/src/cffi/recompiler.py +++ b/src/cffi/recompiler.py @@ -1,7 +1,10 @@ -import io, os, sys +import io +import os +import sys + from . import ffiplatform, model -from .error import VerificationError from .cffi_opcode import * +from .error import VerificationError VERSION_BASE = 0x2601 VERSION_EMBEDDED = 0x2701 diff --git a/src/cffi/setuptools_ext.py b/src/cffi/setuptools_ext.py index 1386e3e0..c85487fd 100644 --- a/src/cffi/setuptools_ext.py +++ b/src/cffi/setuptools_ext.py @@ -2,6 +2,7 @@ import sys import sysconfig + def error(msg): from cffi._shimmed_dist_utils import DistutilsSetupError raise DistutilsSetupError(msg) @@ -107,8 +108,9 @@ def _set_py_limited_api(Extension, kwds): def _add_c_module(dist, ffi, module_name, source, source_extension, kwds): # We are a setuptools extension. Need this build_ext for py_limited_api. from setuptools.command.build_ext import build_ext - from cffi._shimmed_dist_utils import Extension, log, mkpath + from cffi import recompiler + from cffi._shimmed_dist_utils import Extension, log, mkpath allsources = ['$PLACEHOLDER'] allsources.extend(kwds.pop('sources', [])) @@ -149,10 +151,11 @@ def run(self): def _add_py_module(dist, ffi, module_name): - from setuptools.command.build_py import build_py from setuptools.command.build_ext import build_ext - from cffi._shimmed_dist_utils import log, mkpath + from setuptools.command.build_py import build_py + from cffi import recompiler + from cffi._shimmed_dist_utils import log, mkpath def generate_mod(py_file): log.info(f"generating cffi module {py_file!r}") diff --git a/src/cffi/vengine_cpy.py b/src/cffi/vengine_cpy.py index 34e6eb5e..11b2f8f5 100644 --- a/src/cffi/vengine_cpy.py +++ b/src/cffi/vengine_cpy.py @@ -2,9 +2,10 @@ # DEPRECATED: implementation for ffi.verify() # import sys + +from . import _imp_emulation as imp from . import model from .error import VerificationError -from . import _imp_emulation as imp class VCPythonEngine: diff --git a/src/cffi/verifier.py b/src/cffi/verifier.py index 097be958..56c933f2 100644 --- a/src/cffi/verifier.py +++ b/src/cffi/verifier.py @@ -1,12 +1,17 @@ # # DEPRECATED: implementation for ffi.verify() # -import sys, os, binascii, shutil, io -from . import __version_verifier_modules__ -from . import ffiplatform +import binascii +import importlib.machinery +import io +import os +import shutil +import sys + +from . import __version_verifier_modules__, ffiplatform from .error import VerificationError -import importlib.machinery + def _extension_suffixes(): return importlib.machinery.EXTENSION_SUFFIXES[:] diff --git a/testing/cffi0/backend_tests.py b/testing/cffi0/backend_tests.py index 197427ba..e1ab5229 100644 --- a/testing/cffi0/backend_tests.py +++ b/testing/cffi0/backend_tests.py @@ -1,6 +1,10 @@ -import pytest +import ctypes +import ctypes.util import platform -import sys, ctypes, ctypes.util +import sys + +import pytest + from cffi import FFI, CDefError, FFIError, VerificationMissing SIZE_OF_INT = ctypes.sizeof(ctypes.c_int) @@ -1230,7 +1234,9 @@ def test_ffi_buffer_array_size(self): def test_ffi_buffer_with_file(self): ffi = FFI(backend=self.Backend()) - import tempfile, os, array + import array + import os + import tempfile fd, filename = tempfile.mkstemp() f = os.fdopen(fd, 'r+b') a = ffi.new("int[]", list(range(1005))) @@ -1250,7 +1256,8 @@ def test_ffi_buffer_with_file(self): def test_ffi_buffer_with_io(self): ffi = FFI(backend=self.Backend()) - import io, array + import array + import io f = io.BytesIO() a = ffi.new("int[]", list(range(1005))) try: @@ -1956,8 +1963,9 @@ def do_init(): assert seen == [1, 1] def test_init_once_multithread(self): - import sys, time import _thread as thread + import sys + import time # def do_init(): seen.append('init!') diff --git a/testing/cffi0/callback_in_thread.py b/testing/cffi0/callback_in_thread.py index c98605c5..d9413348 100644 --- a/testing/cffi0/callback_in_thread.py +++ b/testing/cffi0/callback_in_thread.py @@ -1,7 +1,10 @@ -import sys, time +import sys +import time + sys.path.insert(0, sys.argv[1]) from cffi import FFI + def _run_callback_in_thread(): ffi = FFI() ffi.cdef(""" diff --git a/testing/cffi0/snippets/distutils_module/setup.py b/testing/cffi0/snippets/distutils_module/setup.py index a4d5551e..377cd978 100644 --- a/testing/cffi0/snippets/distutils_module/setup.py +++ b/testing/cffi0/snippets/distutils_module/setup.py @@ -1,5 +1,6 @@ from distutils.core import setup + import snip_basic_verify setup( diff --git a/testing/cffi0/snippets/distutils_module/snip_basic_verify.py b/testing/cffi0/snippets/distutils_module/snip_basic_verify.py index e8a867ec..5ddc230c 100644 --- a/testing/cffi0/snippets/distutils_module/snip_basic_verify.py +++ b/testing/cffi0/snippets/distutils_module/snip_basic_verify.py @@ -1,7 +1,8 @@ -from cffi import FFI import sys +from cffi import FFI + ffi = FFI() ffi.cdef(""" // some declarations from the man page struct passwd { diff --git a/testing/cffi0/snippets/distutils_package_1/setup.py b/testing/cffi0/snippets/distutils_package_1/setup.py index e3d28a53..4aacd082 100644 --- a/testing/cffi0/snippets/distutils_package_1/setup.py +++ b/testing/cffi0/snippets/distutils_package_1/setup.py @@ -1,5 +1,6 @@ from distutils.core import setup + import snip_basic_verify1 setup( diff --git a/testing/cffi0/snippets/distutils_package_1/snip_basic_verify1/__init__.py b/testing/cffi0/snippets/distutils_package_1/snip_basic_verify1/__init__.py index e8a867ec..5ddc230c 100644 --- a/testing/cffi0/snippets/distutils_package_1/snip_basic_verify1/__init__.py +++ b/testing/cffi0/snippets/distutils_package_1/snip_basic_verify1/__init__.py @@ -1,7 +1,8 @@ -from cffi import FFI import sys +from cffi import FFI + ffi = FFI() ffi.cdef(""" // some declarations from the man page struct passwd { diff --git a/testing/cffi0/snippets/distutils_package_2/setup.py b/testing/cffi0/snippets/distutils_package_2/setup.py index 6d8f72ab..ad8f477f 100644 --- a/testing/cffi0/snippets/distutils_package_2/setup.py +++ b/testing/cffi0/snippets/distutils_package_2/setup.py @@ -1,5 +1,6 @@ from distutils.core import setup + import snip_basic_verify2 setup( diff --git a/testing/cffi0/snippets/distutils_package_2/snip_basic_verify2/__init__.py b/testing/cffi0/snippets/distutils_package_2/snip_basic_verify2/__init__.py index b4ee686e..ede369f8 100644 --- a/testing/cffi0/snippets/distutils_package_2/snip_basic_verify2/__init__.py +++ b/testing/cffi0/snippets/distutils_package_2/snip_basic_verify2/__init__.py @@ -1,7 +1,8 @@ -from cffi import FFI import sys +from cffi import FFI + ffi = FFI() ffi.cdef(""" // some declarations from the man page struct passwd { diff --git a/testing/cffi0/snippets/setuptools_module/setup.py b/testing/cffi0/snippets/setuptools_module/setup.py index 30f2e043..f9f24d50 100644 --- a/testing/cffi0/snippets/setuptools_module/setup.py +++ b/testing/cffi0/snippets/setuptools_module/setup.py @@ -1,6 +1,6 @@ -from setuptools import setup import snip_setuptools_verify +from setuptools import setup setup( zip_safe=False, diff --git a/testing/cffi0/snippets/setuptools_module/snip_setuptools_verify.py b/testing/cffi0/snippets/setuptools_module/snip_setuptools_verify.py index e8a867ec..5ddc230c 100644 --- a/testing/cffi0/snippets/setuptools_module/snip_setuptools_verify.py +++ b/testing/cffi0/snippets/setuptools_module/snip_setuptools_verify.py @@ -1,7 +1,8 @@ -from cffi import FFI import sys +from cffi import FFI + ffi = FFI() ffi.cdef(""" // some declarations from the man page struct passwd { diff --git a/testing/cffi0/snippets/setuptools_package_1/setup.py b/testing/cffi0/snippets/setuptools_package_1/setup.py index 18ea3f66..f1f26880 100644 --- a/testing/cffi0/snippets/setuptools_package_1/setup.py +++ b/testing/cffi0/snippets/setuptools_package_1/setup.py @@ -1,6 +1,6 @@ -from setuptools import setup import snip_setuptools_verify1 +from setuptools import setup setup( zip_safe=False, diff --git a/testing/cffi0/snippets/setuptools_package_1/snip_setuptools_verify1/__init__.py b/testing/cffi0/snippets/setuptools_package_1/snip_setuptools_verify1/__init__.py index e8a867ec..5ddc230c 100644 --- a/testing/cffi0/snippets/setuptools_package_1/snip_setuptools_verify1/__init__.py +++ b/testing/cffi0/snippets/setuptools_package_1/snip_setuptools_verify1/__init__.py @@ -1,7 +1,8 @@ -from cffi import FFI import sys +from cffi import FFI + ffi = FFI() ffi.cdef(""" // some declarations from the man page struct passwd { diff --git a/testing/cffi0/snippets/setuptools_package_2/setup.py b/testing/cffi0/snippets/setuptools_package_2/setup.py index 87fb22b7..07f9f25b 100644 --- a/testing/cffi0/snippets/setuptools_package_2/setup.py +++ b/testing/cffi0/snippets/setuptools_package_2/setup.py @@ -1,6 +1,6 @@ -from setuptools import setup import snip_setuptools_verify2 +from setuptools import setup setup( zip_safe=False, diff --git a/testing/cffi0/snippets/setuptools_package_2/snip_setuptools_verify2/__init__.py b/testing/cffi0/snippets/setuptools_package_2/snip_setuptools_verify2/__init__.py index 5f4bd138..d82f4e8a 100644 --- a/testing/cffi0/snippets/setuptools_package_2/snip_setuptools_verify2/__init__.py +++ b/testing/cffi0/snippets/setuptools_package_2/snip_setuptools_verify2/__init__.py @@ -1,7 +1,8 @@ -from cffi import FFI import sys +from cffi import FFI + ffi = FFI() ffi.cdef(""" // some declarations from the man page struct passwd { diff --git a/testing/cffi0/test_cdata.py b/testing/cffi0/test_cdata.py index 7bc66a1b..678de183 100644 --- a/testing/cffi0/test_cdata.py +++ b/testing/cffi0/test_cdata.py @@ -1,5 +1,6 @@ from cffi import FFI + class FakeBackend: def nonstandard_integer_types(self): diff --git a/testing/cffi0/test_ctypes.py b/testing/cffi0/test_ctypes.py index fdf6f53f..a54e78fb 100644 --- a/testing/cffi0/test_ctypes.py +++ b/testing/cffi0/test_ctypes.py @@ -1,7 +1,9 @@ import sys + import pytest -from testing.cffi0 import backend_tests + from cffi.backend_ctypes import CTypesBackend +from testing.cffi0 import backend_tests class TestCTypes(backend_tests.BackendTests): diff --git a/testing/cffi0/test_ffi_backend.py b/testing/cffi0/test_ffi_backend.py index e6453ea7..a2b1f4bf 100644 --- a/testing/cffi0/test_ffi_backend.py +++ b/testing/cffi0/test_ffi_backend.py @@ -1,8 +1,11 @@ -import sys, platform +import platform +import sys + +import _cffi_backend import pytest -from testing.cffi0 import backend_tests, test_function, test_ownlib + from cffi import FFI -import _cffi_backend +from testing.cffi0 import backend_tests, test_function, test_ownlib class TestFFI(backend_tests.BackendTests, @@ -159,7 +162,8 @@ def test_bogus_struct_containing_struct_containing_array_varsize(self): assert p.foo.data[3] != 78 # has been overwritten with 9999999 def test_issue553(self): - import gc, warnings + import gc + import warnings ffi = FFI(backend=self.Backend()) p = ffi.new("int *", 123) with warnings.catch_warnings(record=True) as w: @@ -168,7 +172,8 @@ def test_issue553(self): assert w == [] def test_issue553_from_buffer(self): - import gc, warnings + import gc + import warnings ffi = FFI(backend=self.Backend()) buf = b"123" with warnings.catch_warnings(record=True) as w: diff --git a/testing/cffi0/test_function.py b/testing/cffi0/test_function.py index 847c1548..d29afdc0 100644 --- a/testing/cffi0/test_function.py +++ b/testing/cffi0/test_function.py @@ -1,10 +1,15 @@ +import ctypes.util +import math +import os +import sys + import pytest + from cffi import FFI, CDefError -import math, os, sys -import ctypes.util from cffi.backend_ctypes import CTypesBackend -from testing.udir import udir from testing.support import FdWriteCapture, StdErrCapture, is_musl +from testing.udir import udir + from .backend_tests import needs_dlopen_none try: diff --git a/testing/cffi0/test_ownlib.py b/testing/cffi0/test_ownlib.py index a7f8b659..caa17ac5 100644 --- a/testing/cffi0/test_ownlib.py +++ b/testing/cffi0/test_ownlib.py @@ -1,12 +1,15 @@ import io -import sys, os -import subprocess, weakref +import os +import subprocess +import sys +import weakref + import pytest + from cffi import FFI from cffi.backend_ctypes import CTypesBackend from testing.support import is_musl - SOURCE = """\ #include diff --git a/testing/cffi0/test_parsing.py b/testing/cffi0/test_parsing.py index b373e32d..d3733f70 100644 --- a/testing/cffi0/test_parsing.py +++ b/testing/cffi0/test_parsing.py @@ -1,9 +1,13 @@ -import sys, re +import re +import sys + import pytest -from cffi import FFI, FFIError, CDefError, VerificationError -from .backend_tests import needs_dlopen_none + +from cffi import FFI, CDefError, FFIError, VerificationError from testing.support import is_musl +from .backend_tests import needs_dlopen_none + class FakeBackend: diff --git a/testing/cffi0/test_platform.py b/testing/cffi0/test_platform.py index c4b96c48..9779dfc4 100644 --- a/testing/cffi0/test_platform.py +++ b/testing/cffi0/test_platform.py @@ -1,7 +1,9 @@ import os + import pytest + from cffi import FFI -from cffi.ffiplatform import maybe_relative_path, flatten +from cffi.ffiplatform import flatten, maybe_relative_path def test_not_absolute(): diff --git a/testing/cffi0/test_unicode_literals.py b/testing/cffi0/test_unicode_literals.py index 1b42c978..d67dcea7 100644 --- a/testing/cffi0/test_unicode_literals.py +++ b/testing/cffi0/test_unicode_literals.py @@ -1,8 +1,10 @@ -import sys, math -from cffi import FFI -from testing.support import is_musl +import math +import sys + import pytest +from cffi import FFI +from testing.support import is_musl lib_m = "m" if sys.platform == 'win32': diff --git a/testing/cffi0/test_verify.py b/testing/cffi0/test_verify.py index 40bde4f7..a9e9dbee 100644 --- a/testing/cffi0/test_verify.py +++ b/testing/cffi0/test_verify.py @@ -1,7 +1,12 @@ +import math +import os import re +import sys +import weakref + import pytest -import sys, os, math, weakref -from cffi import FFI, VerificationError, VerificationMissing, model, FFIError + +from cffi import FFI, FFIError, VerificationError, VerificationMissing, model from testing.support import extra_compile_args, is_musl # eliminate warning noise from common test modules that are repeatedly re-imported @@ -1419,7 +1424,9 @@ def test_ffi_struct_packed(): """) def test_tmpdir(): - import tempfile, os + import os + import tempfile + from testing.udir import udir tmpdir = tempfile.mkdtemp(dir=str(udir)) ffi = FFI() @@ -1429,7 +1436,9 @@ def test_tmpdir(): assert lib.foo(100) == 142 def test_relative_to(): - import tempfile, os + import os + import tempfile + from testing.udir import udir tmpdir = tempfile.mkdtemp(dir=str(udir)) ffi = FFI() @@ -1593,7 +1602,9 @@ def test_addressof(): def test_callback_in_thread(): if sys.platform == 'win32': pytest.skip("pthread only") - import os, subprocess + import os + import subprocess + from cffi import _imp_emulation as imp arg = os.path.join(os.path.dirname(__file__), 'callback_in_thread.py') g = subprocess.Popen([sys.executable, arg, @@ -1960,7 +1971,7 @@ def test_bug_const_char_ptr_array_1(): assert repr(ffi.typeof(lib.a)) == "" def test_bug_const_char_ptr_array_2(): - from cffi import FFI # ignore warnings + from cffi import FFI # ignore warnings ffi = FFI() ffi.cdef("""extern const int a[];""") lib = ffi.verify("""const int a[5];""") @@ -2581,8 +2592,9 @@ def test_passing_large_list(): # assert did not segfault def test_no_regen(): - from cffi.verifier import Verifier, _caller_dir_pycache, _FORCE_GENERIC_ENGINE import os + + from cffi.verifier import _FORCE_GENERIC_ENGINE, Verifier, _caller_dir_pycache ffi = FFI() # make sure the module name is unique modulename = "_cffi_test_no_regen" + str(_FORCE_GENERIC_ENGINE) diff --git a/testing/cffi0/test_version.py b/testing/cffi0/test_version.py index ea82d30f..37d75ef8 100644 --- a/testing/cffi0/test_version.py +++ b/testing/cffi0/test_version.py @@ -1,8 +1,13 @@ -import os, sys -import pytest -import cffi, _cffi_backend +import os +import sys from pathlib import Path +import _cffi_backend +import pytest + +import cffi + + def setup_module(mod): if '_cffi_backend' in sys.builtin_module_names: pytest.skip("this is embedded version") diff --git a/testing/cffi0/test_vgen.py b/testing/cffi0/test_vgen.py index 1a7e05db..0198b46e 100644 --- a/testing/cffi0/test_vgen.py +++ b/testing/cffi0/test_vgen.py @@ -1,4 +1,5 @@ import cffi.verifier + from .test_verify import * diff --git a/testing/cffi0/test_zdistutils.py b/testing/cffi0/test_zdistutils.py index a03cba9e..8c44739f 100644 --- a/testing/cffi0/test_zdistutils.py +++ b/testing/cffi0/test_zdistutils.py @@ -1,10 +1,15 @@ -import sys, os, math, shutil +import math +import os +import shutil +import sys + import pytest + from cffi import FFI, FFIError -from cffi.verifier import Verifier, _locate_engine_class, _get_so_suffixes from cffi.ffiplatform import maybe_relative_path -from testing.udir import udir +from cffi.verifier import Verifier, _get_so_suffixes, _locate_engine_class from testing.support import load_dynamic +from testing.udir import udir pytestmark = [ pytest.mark.thread_unsafe(reason="worker threads would share a compilation directory"), diff --git a/testing/cffi0/test_zintegration.py b/testing/cffi0/test_zintegration.py index 38d911b6..a62fa79b 100644 --- a/testing/cffi0/test_zintegration.py +++ b/testing/cffi0/test_zintegration.py @@ -1,12 +1,16 @@ -import os, sys, shutil +import os +import shutil import subprocess +import sys import sysconfig import textwrap from pathlib import Path -from testing.udir import udir -from testing.support import create_bridged_venv + import pytest +from testing.support import create_bridged_venv +from testing.udir import udir + if sys.platform == 'win32': pytestmark = pytest.mark.skip('snippets do not run on win32') try: diff --git a/testing/cffi1/test_cffi_binary.py b/testing/cffi1/test_cffi_binary.py index f4f4e188..02fa3e50 100644 --- a/testing/cffi1/test_cffi_binary.py +++ b/testing/cffi1/test_cffi_binary.py @@ -1,8 +1,12 @@ -import sys, os -import pytest +import os +import sys + import _cffi_backend +import pytest + from testing.support import is_musl + def test_no_unknown_exported_symbols(): if not hasattr(_cffi_backend, '__file__'): pytest.skip("_cffi_backend module is built-in") diff --git a/testing/cffi1/test_cffi_gen_src_meson.py b/testing/cffi1/test_cffi_gen_src_meson.py index b4b26ab4..adb92bc2 100644 --- a/testing/cffi1/test_cffi_gen_src_meson.py +++ b/testing/cffi1/test_cffi_gen_src_meson.py @@ -19,7 +19,6 @@ import pytest import cffi - from testing.support import create_bridged_venv pytestmark = [ diff --git a/testing/cffi1/test_commontypes.py b/testing/cffi1/test_commontypes.py index d28810e5..e25f84ae 100644 --- a/testing/cffi1/test_commontypes.py +++ b/testing/cffi1/test_commontypes.py @@ -1,6 +1,10 @@ -import os, cffi, re -import pytest +import os +import re + import _cffi_backend +import pytest + +import cffi def getlines(): diff --git a/testing/cffi1/test_dlopen.py b/testing/cffi1/test_dlopen.py index 1753bc99..28755fbd 100644 --- a/testing/cffi1/test_dlopen.py +++ b/testing/cffi1/test_dlopen.py @@ -1,5 +1,6 @@ import pytest -from cffi import FFI, VerificationError, CDefError + +from cffi import FFI, CDefError, VerificationError from cffi.recompiler import make_py_source from testing.udir import udir diff --git a/testing/cffi1/test_ffi_obj.py b/testing/cffi1/test_ffi_obj.py index 78c57df9..6cfef606 100644 --- a/testing/cffi1/test_ffi_obj.py +++ b/testing/cffi1/test_ffi_obj.py @@ -1,6 +1,7 @@ import sys -import pytest + import _cffi_backend as _cffi1_backend +import pytest def test_ffi_new(): @@ -34,7 +35,8 @@ def test_ffi_cache_type(): @pytest.mark.thread_unsafe(reason="May not pass if other threads unexpectedly trigger the gc") def test_ffi_type_not_immortal(): - import weakref, gc + import gc + import weakref ffi = _cffi1_backend.FFI() # this test can fail on free-threaded builds lazier GC if the type was used by another test t1 = ffi.typeof("unsigned short int **") diff --git a/testing/cffi1/test_function_args.py b/testing/cffi1/test_function_args.py index 501974b2..67e51f2a 100644 --- a/testing/cffi1/test_function_args.py +++ b/testing/cffi1/test_function_args.py @@ -1,4 +1,6 @@ -import pytest, sys +import sys + +import pytest pytestmark = [ pytest.mark.thread_unsafe(reason="Workers would share a build directory"), @@ -11,7 +13,7 @@ raise ImportError("this test is skipped because it keeps finding " "failures in libffi, instead of cffi") - from hypothesis import given, settings, example + from hypothesis import example, given, settings from hypothesis import strategies as st except ImportError as e: e1 = e @@ -19,8 +21,11 @@ def test_types(): pytest.skip(str(e1)) else: + import random + import sys + from cffi import FFI - import sys, random + from .test_recompiler import verify ALL_PRIMITIVES = [ @@ -114,8 +119,9 @@ def build_type(tp): # when getting segfaults, enable this: if False: - from testing.udir import udir import subprocess + + from testing.udir import udir with (udir / 'run1.py').open('w') as f: f.write(f'import sys; sys.path = {sys.path!r}\n') f.write('from _CFFI_test_function_args_%d import ffi, lib\n' % @@ -180,8 +186,9 @@ def expand(value): # when getting segfaults, enable this: if False: - from testing.udir import udir import subprocess + + from testing.udir import udir with (udir / 'run1.py').open('w') as f: f.write(f'import sys; sys.path = {sys.path!r}\n') f.write('from _CFFI_test_function_args_%d import ffi, lib\n' % diff --git a/testing/cffi1/test_new_ffi_1.py b/testing/cffi1/test_new_ffi_1.py index 62c8f0bc..91984494 100644 --- a/testing/cffi1/test_new_ffi_1.py +++ b/testing/cffi1/test_new_ffi_1.py @@ -1,11 +1,16 @@ -import pytest +import ctypes +import io +import os import platform -import sys, os, io, ctypes +import sys + +import pytest + import cffi -from testing.udir import udir -from testing.support import load_dynamic -from cffi.recompiler import recompile from cffi.cffi_opcode import PRIMITIVE_TO_INDEX +from cffi.recompiler import recompile +from testing.support import load_dynamic +from testing.udir import udir SIZE_OF_INT = ctypes.sizeof(ctypes.c_int) SIZE_OF_LONG = ctypes.sizeof(ctypes.c_long) @@ -1198,7 +1203,9 @@ def test_ffi_buffer_array_size(self): assert ffi.buffer(a1)[:] == ffi.buffer(a2, 4*10)[:] def test_ffi_buffer_with_file(self): - import tempfile, os, array + import array + import os + import tempfile fd, filename = tempfile.mkstemp() f = os.fdopen(fd, 'r+b') a = ffi.new("int[]", list(range(1005))) @@ -1217,7 +1224,8 @@ def test_ffi_buffer_with_file(self): os.unlink(filename) def test_ffi_buffer_with_io(self): - import io, array + import array + import io f = io.BytesIO() a = ffi.new("int[]", list(range(1005))) try: @@ -1785,7 +1793,7 @@ def test_import_from_lib(self): "int myvar = -5;\n" "#define MYFOO 42", tmpdir=str(udir)) load_dynamic("_test_import_from_lib", outputfilename) - from _test_import_from_lib.lib import myfunc, myvar, MYFOO + from _test_import_from_lib.lib import MYFOO, myfunc, myvar assert MYFOO == 42 assert myfunc(43) == 44 assert myvar == -5 # but can't be changed, so not very useful diff --git a/testing/cffi1/test_parse_c_type.py b/testing/cffi1/test_parse_c_type.py index 52f4737a..61595348 100644 --- a/testing/cffi1/test_parse_c_type.py +++ b/testing/cffi1/test_parse_c_type.py @@ -1,8 +1,12 @@ -import sys, re, os +import os +import re +import sys +from pathlib import Path + import pytest + import cffi from cffi import cffi_opcode -from pathlib import Path if '__pypy__' in sys.builtin_module_names: try: diff --git a/testing/cffi1/test_pkgconfig.py b/testing/cffi1/test_pkgconfig.py index 8a494527..5ec2b3b7 100644 --- a/testing/cffi1/test_pkgconfig.py +++ b/testing/cffi1/test_pkgconfig.py @@ -1,8 +1,9 @@ -import sys import subprocess +import sys + import pytest -from cffi import pkgconfig -from cffi import PkgConfigError + +from cffi import PkgConfigError, pkgconfig def mock_call(libname, flag): diff --git a/testing/cffi1/test_re_python.py b/testing/cffi1/test_re_python.py index 77439ed8..47260acc 100644 --- a/testing/cffi1/test_re_python.py +++ b/testing/cffi1/test_re_python.py @@ -1,9 +1,11 @@ -import sys, os +import os +import sys + import pytest -from cffi import FFI -from cffi import recompiler, ffiplatform, VerificationMissing -from testing.udir import udir + +from cffi import FFI, VerificationMissing, ffiplatform, recompiler from testing.support import is_musl +from testing.udir import udir def setup_module(mod): diff --git a/testing/cffi1/test_realize_c_type.py b/testing/cffi1/test_realize_c_type.py index 824beaf3..08eb9077 100644 --- a/testing/cffi1/test_realize_c_type.py +++ b/testing/cffi1/test_realize_c_type.py @@ -1,5 +1,7 @@ import sys + import pytest + from cffi import cffi_opcode diff --git a/testing/cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py index 9299188e..b2547946 100644 --- a/testing/cffi1/test_recompiler.py +++ b/testing/cffi1/test_recompiler.py @@ -1,10 +1,12 @@ -import sys, os +import os +import sys + import pytest -from cffi import FFI, VerificationError, FFIError, CDefError -from cffi import recompiler -from testing.udir import udir + +from cffi import FFI, CDefError, FFIError, VerificationError, recompiler from testing.support import FdWriteCapture, StdErrCapture, _verify +from testing.udir import udir pytestmark = [ pytest.mark.thread_unsafe(reason="worker threads would share a compilation directory"), diff --git a/testing/cffi1/test_verify1.py b/testing/cffi1/test_verify1.py index bdd6c3ee..ffb614f6 100644 --- a/testing/cffi1/test_verify1.py +++ b/testing/cffi1/test_verify1.py @@ -1,10 +1,20 @@ -import os, sys, math +import math +import os +import sys + +import _cffi_backend import pytest -from cffi import FFI, FFIError, VerificationError, VerificationMissing, model -from cffi import CDefError -from cffi import recompiler + +from cffi import ( + FFI, + CDefError, + FFIError, + VerificationError, + VerificationMissing, + model, + recompiler, +) from testing.support import _verify, extra_compile_args, is_musl -import _cffi_backend pytestmark = [ pytest.mark.thread_unsafe(reason="FFI verifier is not thread-safe"), @@ -1388,7 +1398,9 @@ def test_ffi_struct_packed(): """) def test_tmpdir(): - import tempfile, os + import os + import tempfile + from testing.udir import udir tmpdir = tempfile.mkdtemp(dir=str(udir)) ffi = FFI() @@ -1399,7 +1411,9 @@ def test_tmpdir(): def test_relative_to(): pytest.skip("not available") - import tempfile, os + import os + import tempfile + from testing.udir import udir tmpdir = tempfile.mkdtemp(dir=str(udir)) ffi = FFI() @@ -1555,7 +1569,9 @@ def test_callback_in_thread(): pytest.xfail("adapt or remove") if sys.platform == 'win32': pytest.skip("pthread only") - import os, subprocess + import os + import subprocess + from cffi import _imp_emulation as imp arg = os.path.join(os.path.dirname(__file__), 'callback_in_thread.py') g = subprocess.Popen([sys.executable, arg, diff --git a/testing/cffi1/test_zdist.py b/testing/cffi1/test_zdist.py index d24d30b4..2a2219ab 100644 --- a/testing/cffi1/test_zdist.py +++ b/testing/cffi1/test_zdist.py @@ -1,11 +1,14 @@ -import sys, os -import pytest +import os import subprocess -import cffi -from testing.udir import udir +import sys from shutil import rmtree from tempfile import mkdtemp +import pytest + +import cffi +from testing.udir import udir + pytestmark = [ pytest.mark.thread_unsafe(reason="very slow in parallel"), ] diff --git a/testing/conftest.py b/testing/conftest.py index 74d09a4c..6d382d06 100644 --- a/testing/conftest.py +++ b/testing/conftest.py @@ -1,9 +1,9 @@ import os -import pytest import sys - from ctypes import util +import pytest + try: import pytest_run_parallel # noqa:F401 PARALLEL_RUN_AVAILABLE = True @@ -15,13 +15,11 @@ def _msvc_env(): from setuptools._distutils.util import get_platform try: # setuptools >= 80 - from setuptools._distutils.compilers.C.msvc import ( - _get_vc_env, _get_vcvars_spec) + from setuptools._distutils.compilers.C.msvc import _get_vc_env, _get_vcvars_spec from setuptools._distutils.util import get_host_platform spec = _get_vcvars_spec(get_host_platform(), get_platform()) except ImportError: - from setuptools._distutils._msvccompiler import ( - _get_vc_env, PLAT_TO_VCVARS) + from setuptools._distutils._msvccompiler import PLAT_TO_VCVARS, _get_vc_env spec = PLAT_TO_VCVARS[get_platform()] return _get_vc_env(spec) diff --git a/testing/embedding/__init__.py b/testing/embedding/__init__.py index 13bb2072..cb387112 100644 --- a/testing/embedding/__init__.py +++ b/testing/embedding/__init__.py @@ -1,4 +1,5 @@ import sys + import pytest if sys.platform == "win32": diff --git a/testing/embedding/test_basic.py b/testing/embedding/test_basic.py index 9d8633ad..f1e677f6 100644 --- a/testing/embedding/test_basic.py +++ b/testing/embedding/test_basic.py @@ -1,9 +1,14 @@ -import sys, os, re -import shutil, subprocess, time +import os +import re +import shutil +import subprocess +import sys +import time + import pytest -from testing.udir import udir -import cffi +import cffi +from testing.udir import udir local_dir = os.path.dirname(os.path.abspath(__file__)) _link_error = '?' diff --git a/testing/embedding/test_performance.py b/testing/embedding/test_performance.py index a0e8458e..29dc8ee5 100644 --- a/testing/embedding/test_performance.py +++ b/testing/embedding/test_performance.py @@ -1,4 +1,5 @@ import sys + from testing.embedding.test_basic import EmbeddingTests if sys.platform == 'win32': diff --git a/testing/embedding/withunicode.py b/testing/embedding/withunicode.py index c488676d..68c1b9bc 100644 --- a/testing/embedding/withunicode.py +++ b/testing/embedding/withunicode.py @@ -1,5 +1,6 @@ -import sys, cffi +import sys +import cffi ffi = cffi.FFI() diff --git a/testing/support.py b/testing/support.py index 96b10cb6..312983f0 100644 --- a/testing/support.py +++ b/testing/support.py @@ -1,7 +1,11 @@ -import sys, os -import site, subprocess +import os +import site +import subprocess +import sys from pathlib import Path + import pytest + from cffi._imp_emulation import load_dynamic __all__ = ['load_dynamic'] @@ -56,6 +60,7 @@ def getvalue(self): def _verify(ffi, module_name, preamble, *args, **kwds): from cffi.recompiler import recompile + from .udir import udir assert module_name not in sys.modules, f"module name conflict: {module_name!r}" kwds.setdefault('tmpdir', str(udir)) diff --git a/testing/udir.py b/testing/udir.py index ca73683a..cb76359e 100644 --- a/testing/udir.py +++ b/testing/udir.py @@ -1,4 +1,8 @@ -import shutil, sys, tempfile, os, atexit +import atexit +import os +import shutil +import sys +import tempfile from pathlib import Path From d1568af53fe514afedcbe3fedad7fb14a6bc71d3 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Wed, 18 Nov 2026 15:15:45 +0100 Subject: [PATCH 11/17] Apply ruff/Perflint rule PERF401 Use a list comprehension to create a transformed list --- src/cffi/cparser.py | 16 ++++++++-------- src/cffi/ffiplatform.py | 3 +-- src/cffi/model.py | 4 +--- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/cffi/cparser.py b/src/cffi/cparser.py index deb2c703..3935aca3 100644 --- a/src/cffi/cparser.py +++ b/src/cffi/cparser.py @@ -319,10 +319,9 @@ def _parse(self, csource): ctn.discard(name) typenames += sorted(ctn) # - csourcelines = [] - csourcelines.append('# 1 ""') - for typename in typenames: - csourcelines.append(f'typedef int {typename};') + csourcelines = ['# 1 ""'] + csourcelines.extend(f'typedef int {typename};' + for typename in typenames) csourcelines.append('typedef int __dotdotdotint__, __dotdotdotfloat__,' ' __dotdotdot__;') # this forces pycparser to consider the following in the file @@ -656,10 +655,11 @@ def _get_type_and_quals(self, typenode, name=None, partial_length_ok=False, else: break # ignore the 'signed' prefix below, and reorder the others - newnames = [] - for prefix in ('unsigned', 'short', 'long'): - for i in range(prefixes.get(prefix, 0)): - newnames.append(prefix) + newnames = [ + prefix + for prefix in ('unsigned', 'short', 'long') + for i in range(prefixes.get(prefix, 0)) + ] if not names: names = ['int'] # implicitly if names == ['int']: # but kill it if 'short' or 'long' diff --git a/src/cffi/ffiplatform.py b/src/cffi/ffiplatform.py index 558f2c62..2c96b2f8 100644 --- a/src/cffi/ffiplatform.py +++ b/src/cffi/ffiplatform.py @@ -10,8 +10,7 @@ def get_extension(srcfilename, modname, sources=(), **kwds): from cffi._shimmed_dist_utils import Extension allsources = [srcfilename] - for src in sources: - allsources.append(os.path.normpath(src)) + allsources.extend(os.path.normpath(src) for src in sources) return Extension(name=modname, sources=allsources, **kwds) def compile(tmpdir, ext, compiler_verbose=0, debug=None): diff --git a/src/cffi/model.py b/src/cffi/model.py index 35a9c393..88bc2724 100644 --- a/src/cffi/model.py +++ b/src/cffi/model.py @@ -240,9 +240,7 @@ class FunctionPtrType(BaseFunctionType): def build_backend_type(self, ffi, finishlist): result = self.result.get_cached_btype(ffi, finishlist) - args = [] - for tp in self.args: - args.append(tp.get_cached_btype(ffi, finishlist)) + args = [tp.get_cached_btype(ffi, finishlist) for tp in self.args] abi_args = () if self.abi == "__stdcall": if not self.ellipsis: # __stdcall ignored for variadic funcs From a045cfd9b95feb7829ab1156cf75868cb6a50b8f Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Wed, 18 Nov 2026 15:17:43 +0100 Subject: [PATCH 12/17] Apply ruff/pycodestyle rule E722 Do not use bare `except` --- src/cffi/backend_ctypes.py | 2 +- testing/cffi0/test_verify.py | 2 +- testing/cffi1/test_verify1.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cffi/backend_ctypes.py b/src/cffi/backend_ctypes.py index 04bb5eb3..37a217cc 100644 --- a/src/cffi/backend_ctypes.py +++ b/src/cffi/backend_ctypes.py @@ -855,7 +855,7 @@ def callback(*args): try: res2 = init(*args2) res2 = BResult._to_ctypes(res2) - except: + except Exception: traceback.print_exc() res2 = error if issubclass(BResult, CTypesGenericPtr): diff --git a/testing/cffi0/test_verify.py b/testing/cffi0/test_verify.py index a9e9dbee..096b36ea 100644 --- a/testing/cffi0/test_verify.py +++ b/testing/cffi0/test_verify.py @@ -2110,7 +2110,7 @@ def _run_in_multiple_threads(test1): def wrapper(lock): try: test1() - except: + except Exception: errors.append(sys.exc_info()) lock.release() locks = [] diff --git a/testing/cffi1/test_verify1.py b/testing/cffi1/test_verify1.py index ffb614f6..2e9b8269 100644 --- a/testing/cffi1/test_verify1.py +++ b/testing/cffi1/test_verify1.py @@ -2080,7 +2080,7 @@ def _run_in_multiple_threads(test1): def wrapper(lock): try: test1() - except: + except Exception: errors.append(sys.exc_info()) lock.release() locks = [] From e33c63595bb028fea1952dfd9814ab7889c0477f Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Wed, 18 Nov 2026 13:01:58 +0100 Subject: [PATCH 13/17] Apply ruff/Pyflakes rule F401 Module imported but unused --- .github/actions/dynamatrix/matrix_yaml_to_json.py | 1 - demo/pwuid.py | 3 --- demo/winclipboard.py | 1 - demo/xclient.py | 3 --- doc/source/conf.py | 3 --- setup.py | 2 +- setup_base.py | 1 - src/c/test_c.py | 3 --- src/cffi/__init__.py | 2 +- src/cffi/_imp_emulation.py | 2 +- src/cffi/cparser.py | 6 +++--- src/cffi/lock.py | 3 +-- testing/cffi0/backend_tests.py | 1 - testing/cffi0/test_ctypes.py | 2 -- testing/cffi0/test_ffi_backend.py | 1 - testing/cffi0/test_function.py | 4 ++-- testing/cffi0/test_ownlib.py | 1 - testing/cffi0/test_verify.py | 2 +- testing/cffi0/test_zdistutils.py | 2 +- testing/cffi1/test_cffi_gen_src_meson.py | 3 --- testing/cffi1/test_new_ffi_1.py | 2 +- testing/cffi1/test_pkgconfig.py | 3 --- testing/cffi1/test_re_python.py | 4 +--- testing/cffi1/test_verify1.py | 2 -- testing/conftest.py | 1 - testing/embedding/test_basic.py | 1 - testing/embedding/withunicode.py | 2 -- testing/udir.py | 1 - 28 files changed, 13 insertions(+), 49 deletions(-) diff --git a/.github/actions/dynamatrix/matrix_yaml_to_json.py b/.github/actions/dynamatrix/matrix_yaml_to_json.py index 9839841e..6ea5347c 100644 --- a/.github/actions/dynamatrix/matrix_yaml_to_json.py +++ b/.github/actions/dynamatrix/matrix_yaml_to_json.py @@ -5,7 +5,6 @@ import os import pathlib import sys -import typing as t from collections.abc import MutableMapping, Sequence import yaml diff --git a/demo/pwuid.py b/demo/pwuid.py index 86f83823..0e778f66 100644 --- a/demo/pwuid.py +++ b/demo/pwuid.py @@ -1,6 +1,3 @@ -import os -import sys - # run pwuid_build first, then make sure the shared object is on sys.path from _pwuid_cffi import ffi, lib diff --git a/demo/winclipboard.py b/demo/winclipboard.py index 8425d23b..888753a7 100644 --- a/demo/winclipboard.py +++ b/demo/winclipboard.py @@ -1,6 +1,5 @@ __author__ = "Israel Fruchter " -import os import sys if not sys.platform == 'win32': diff --git a/demo/xclient.py b/demo/xclient.py index 3864ad6c..a781f286 100644 --- a/demo/xclient.py +++ b/demo/xclient.py @@ -1,6 +1,3 @@ -import os -import sys - # run xclient_build first, then make sure the shared object is on sys.path from _xclient_cffi import ffi, lib diff --git a/doc/source/conf.py b/doc/source/conf.py index 4cf87f5e..10516c60 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -9,9 +9,6 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import os -import sys - # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. diff --git a/setup.py b/setup.py index de8eae54..c9a52d66 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ # the setuptools distutils shim should make distutils available, but this will definitely do # it, since setuptools is now required at build-time -import setuptools +import setuptools # noqa: F401 sources = ['src/c/_cffi_backend.c'] libraries = ['ffi'] diff --git a/setup_base.py b/setup_base.py index 873834d6..c2503d3a 100644 --- a/setup_base.py +++ b/setup_base.py @@ -1,4 +1,3 @@ -import os import sys from setup import ( diff --git a/src/c/test_c.py b/src/c/test_c.py index e2ddc19b..8fb8bbf9 100644 --- a/src/c/test_c.py +++ b/src/c/test_c.py @@ -4,8 +4,6 @@ import os import sys import traceback -import typing as t -import unittest.mock import pytest @@ -4170,7 +4168,6 @@ def test_cdata_dir(): check_dir(pp[0][0], ['a1', 'a2']) def test_char_pointer_conversion(): - import warnings BCharP = new_pointer_type(new_primitive_type("char")) BIntP = new_pointer_type(new_primitive_type("int")) BVoidP = new_pointer_type(new_void_type()) diff --git a/src/cffi/__init__.py b/src/cffi/__init__.py index dd4ede4a..1b4388d8 100644 --- a/src/cffi/__init__.py +++ b/src/cffi/__init__.py @@ -1,4 +1,4 @@ -__all__ = ['FFI', 'CDefError','FFIError', +__all__ = ['FFI', 'CDefError','FFIError', 'PkgConfigError', 'VerificationError', 'VerificationMissing'] from .api import FFI diff --git a/src/cffi/_imp_emulation.py b/src/cffi/_imp_emulation.py index 59f99641..04d76b8d 100644 --- a/src/cffi/_imp_emulation.py +++ b/src/cffi/_imp_emulation.py @@ -11,7 +11,7 @@ import os import sys import tokenize - from _imp import acquire_lock, is_builtin, is_frozen, release_lock + from _imp import is_builtin, is_frozen from importlib import machinery from importlib._bootstrap import _load diff --git a/src/cffi/cparser.py b/src/cffi/cparser.py index 3935aca3..884e8d92 100644 --- a/src/cffi/cparser.py +++ b/src/cffi/cparser.py @@ -7,7 +7,6 @@ except ImportError: import pycparser import re -import sys import weakref try: @@ -20,8 +19,9 @@ def _workaround_for_static_import_finders(): # Issue #392: packaging tools like cx_Freeze can not find these # because pycparser uses exec dynamic import. This is an obscure # workaround. This function is never called. - import pycparser.lextab - import pycparser.yacctab + import pycparser.lextab # noqa: F401 + import pycparser.yacctab # noqa: F401 + pass CDEF_SOURCE_STRING = "" _r_comment = re.compile(r"/\*.*?\*/|//([^\n\\]|\\.)*?$", diff --git a/src/cffi/lock.py b/src/cffi/lock.py index dafb3462..e3c492b4 100644 --- a/src/cffi/lock.py +++ b/src/cffi/lock.py @@ -1,5 +1,4 @@ -import sys -from _thread import allocate_lock +from _thread import allocate_lock # noqa: F401 ##import sys diff --git a/testing/cffi0/backend_tests.py b/testing/cffi0/backend_tests.py index e1ab5229..6aa11afc 100644 --- a/testing/cffi0/backend_tests.py +++ b/testing/cffi0/backend_tests.py @@ -1964,7 +1964,6 @@ def do_init(): def test_init_once_multithread(self): import _thread as thread - import sys import time # def do_init(): diff --git a/testing/cffi0/test_ctypes.py b/testing/cffi0/test_ctypes.py index a54e78fb..2d95f0d5 100644 --- a/testing/cffi0/test_ctypes.py +++ b/testing/cffi0/test_ctypes.py @@ -1,5 +1,3 @@ -import sys - import pytest from cffi.backend_ctypes import CTypesBackend diff --git a/testing/cffi0/test_ffi_backend.py b/testing/cffi0/test_ffi_backend.py index a2b1f4bf..50c3de9e 100644 --- a/testing/cffi0/test_ffi_backend.py +++ b/testing/cffi0/test_ffi_backend.py @@ -1,4 +1,3 @@ -import platform import sys import _cffi_backend diff --git a/testing/cffi0/test_function.py b/testing/cffi0/test_function.py index d29afdc0..01b797c9 100644 --- a/testing/cffi0/test_function.py +++ b/testing/cffi0/test_function.py @@ -5,7 +5,7 @@ import pytest -from cffi import FFI, CDefError +from cffi import FFI from cffi.backend_ctypes import CTypesBackend from testing.support import FdWriteCapture, StdErrCapture, is_musl from testing.udir import udir @@ -15,7 +15,7 @@ try: from StringIO import StringIO except ImportError: - from io import StringIO + pass try: from packaging.tags import platform_tags diff --git a/testing/cffi0/test_ownlib.py b/testing/cffi0/test_ownlib.py index caa17ac5..42faaee0 100644 --- a/testing/cffi0/test_ownlib.py +++ b/testing/cffi0/test_ownlib.py @@ -1,4 +1,3 @@ -import io import os import subprocess import sys diff --git a/testing/cffi0/test_verify.py b/testing/cffi0/test_verify.py index 096b36ea..cce6ca94 100644 --- a/testing/cffi0/test_verify.py +++ b/testing/cffi0/test_verify.py @@ -2594,7 +2594,7 @@ def test_passing_large_list(): def test_no_regen(): import os - from cffi.verifier import _FORCE_GENERIC_ENGINE, Verifier, _caller_dir_pycache + from cffi.verifier import _FORCE_GENERIC_ENGINE ffi = FFI() # make sure the module name is unique modulename = "_cffi_test_no_regen" + str(_FORCE_GENERIC_ENGINE) diff --git a/testing/cffi0/test_zdistutils.py b/testing/cffi0/test_zdistutils.py index 8c44739f..8d8f09d4 100644 --- a/testing/cffi0/test_zdistutils.py +++ b/testing/cffi0/test_zdistutils.py @@ -5,7 +5,7 @@ import pytest -from cffi import FFI, FFIError +from cffi import FFI from cffi.ffiplatform import maybe_relative_path from cffi.verifier import Verifier, _get_so_suffixes, _locate_engine_class from testing.support import load_dynamic diff --git a/testing/cffi1/test_cffi_gen_src_meson.py b/testing/cffi1/test_cffi_gen_src_meson.py index adb92bc2..9240f1e6 100644 --- a/testing/cffi1/test_cffi_gen_src_meson.py +++ b/testing/cffi1/test_cffi_gen_src_meson.py @@ -9,8 +9,6 @@ """ -import os -import re import shutil import subprocess import sys @@ -18,7 +16,6 @@ import pytest -import cffi from testing.support import create_bridged_venv pytestmark = [ diff --git a/testing/cffi1/test_new_ffi_1.py b/testing/cffi1/test_new_ffi_1.py index 91984494..e4ca32f0 100644 --- a/testing/cffi1/test_new_ffi_1.py +++ b/testing/cffi1/test_new_ffi_1.py @@ -1,6 +1,5 @@ import ctypes import io -import os import platform import sys @@ -1799,6 +1798,7 @@ def test_import_from_lib(self): assert myvar == -5 # but can't be changed, so not very useful with pytest.raises(ImportError): from _test_import_from_lib.lib import bar + pass d = {} exec("from _test_import_from_lib.lib import *", d) assert ({key for key in d if not key.startswith('_')} == diff --git a/testing/cffi1/test_pkgconfig.py b/testing/cffi1/test_pkgconfig.py index 5ec2b3b7..c0843af2 100644 --- a/testing/cffi1/test_pkgconfig.py +++ b/testing/cffi1/test_pkgconfig.py @@ -1,6 +1,3 @@ -import subprocess -import sys - import pytest from cffi import PkgConfigError, pkgconfig diff --git a/testing/cffi1/test_re_python.py b/testing/cffi1/test_re_python.py index 47260acc..4b597001 100644 --- a/testing/cffi1/test_re_python.py +++ b/testing/cffi1/test_re_python.py @@ -3,7 +3,7 @@ import pytest -from cffi import FFI, VerificationMissing, ffiplatform, recompiler +from cffi import FFI, VerificationMissing, ffiplatform from testing.support import is_musl from testing.udir import udir @@ -116,7 +116,6 @@ def test_function_with_varargs(): assert type(lib.add43) is _cffi_backend.FFI.CData def test_dlopen_none(): - import _cffi_backend from re_python_pysrc import ffi name = None if sys.platform == 'win32': @@ -130,7 +129,6 @@ def test_dlopen_none(): @pytest.mark.thread_unsafe( reason="Worker threads might call dlclose concurrently") def test_dlclose(): - import _cffi_backend from re_python_pysrc import ffi lib = ffi.dlopen(extmod) ffi.dlclose(lib) diff --git a/testing/cffi1/test_verify1.py b/testing/cffi1/test_verify1.py index 2e9b8269..aa879856 100644 --- a/testing/cffi1/test_verify1.py +++ b/testing/cffi1/test_verify1.py @@ -1,5 +1,4 @@ import math -import os import sys import _cffi_backend @@ -12,7 +11,6 @@ VerificationError, VerificationMissing, model, - recompiler, ) from testing.support import _verify, extra_compile_args, is_musl diff --git a/testing/conftest.py b/testing/conftest.py index 6d382d06..06c00701 100644 --- a/testing/conftest.py +++ b/testing/conftest.py @@ -1,6 +1,5 @@ import os import sys -from ctypes import util import pytest diff --git a/testing/embedding/test_basic.py b/testing/embedding/test_basic.py index f1e677f6..41f6f953 100644 --- a/testing/embedding/test_basic.py +++ b/testing/embedding/test_basic.py @@ -3,7 +3,6 @@ import shutil import subprocess import sys -import time import pytest diff --git a/testing/embedding/withunicode.py b/testing/embedding/withunicode.py index 68c1b9bc..89cbe53c 100644 --- a/testing/embedding/withunicode.py +++ b/testing/embedding/withunicode.py @@ -1,5 +1,3 @@ -import sys - import cffi ffi = cffi.FFI() diff --git a/testing/udir.py b/testing/udir.py index cb76359e..1614a10d 100644 --- a/testing/udir.py +++ b/testing/udir.py @@ -1,7 +1,6 @@ import atexit import os import shutil -import sys import tempfile from pathlib import Path From 1cb18cb5850d2e34554e46a83e89479cda24827f Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Wed, 18 Nov 2026 15:51:13 +0100 Subject: [PATCH 14/17] Apply ruff/Pyflakes rule F841 Local variable is assigned to but never used --- src/c/test_c.py | 4 ++-- src/cffi/pkgconfig.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/c/test_c.py b/src/c/test_c.py index 8fb8bbf9..4fc060a5 100644 --- a/src/c/test_c.py +++ b/src/c/test_c.py @@ -4176,10 +4176,10 @@ def test_char_pointer_conversion(): z2 = cast(BIntP, 0) z3 = cast(BVoidP, 0) z4 = cast(BUCharP, 0) - with pytest.raises(TypeError) as e1: + with pytest.raises(TypeError): newp(new_pointer_type(BIntP), z1) newp(new_pointer_type(BVoidP), z1) # fine - with pytest.raises(TypeError) as e2: + with pytest.raises(TypeError): newp(new_pointer_type(BCharP), z2) newp(new_pointer_type(BVoidP), z2) # fine newp(new_pointer_type(BCharP), z3) # fine diff --git a/src/cffi/pkgconfig.py b/src/cffi/pkgconfig.py index cfb04802..a7094c77 100644 --- a/src/cffi/pkgconfig.py +++ b/src/cffi/pkgconfig.py @@ -100,7 +100,6 @@ def get_other_libs(string): # return kwargs for given libname def kwargs(libname): - fse = sys.getfilesystemencoding() all_cflags = call(libname, "--cflags") all_libs = call(libname, "--libs") return { From 060bbc9d5487a151649e256451991d66268a2c9b Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Wed, 18 Nov 2026 15:40:00 +0100 Subject: [PATCH 15/17] Apply ruff rule RUF010 Use explicit conversion flag --- src/cffi/recompiler.py | 2 +- src/cffi/vengine_cpy.py | 2 +- src/cffi/vengine_gen.py | 2 +- testing/cffi1/test_re_python.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cffi/recompiler.py b/src/cffi/recompiler.py index 9aa315fc..2ddcf8ba 100644 --- a/src/cffi/recompiler.py +++ b/src/cffi/recompiler.py @@ -865,7 +865,7 @@ def _struct_decl(self, tp, cname, approxname): ftype.get_c_name('*tmp', f'field {fname!r}', quals=fqual), fname)) except VerificationError as e: - prnt(f' /* {str(e)} */') # cannot verify it, ignore + prnt(f' /* {e} */') # cannot verify it, ignore prnt('}') prnt(f'struct _cffi_align_{approxname} {{ char x; {cname} y; }};') prnt() diff --git a/src/cffi/vengine_cpy.py b/src/cffi/vengine_cpy.py index 11b2f8f5..075bb4be 100644 --- a/src/cffi/vengine_cpy.py +++ b/src/cffi/vengine_cpy.py @@ -482,7 +482,7 @@ def _generate_struct_or_union_decl(self, tp, prefix, name): ftype.get_c_name('*tmp', f'field {fname!r}', quals=fqual), fname)) except VerificationError as e: - prnt(f' /* {str(e)} */') # cannot verify it, ignore + prnt(f' /* {e} */') # cannot verify it, ignore prnt('}') prnt('static PyObject *') prnt(f'{layoutfuncname}(PyObject *self, PyObject *noarg)') diff --git a/src/cffi/vengine_gen.py b/src/cffi/vengine_gen.py index db4c474e..a85b7d1d 100644 --- a/src/cffi/vengine_gen.py +++ b/src/cffi/vengine_gen.py @@ -277,7 +277,7 @@ def _generate_struct_or_union_decl(self, tp, prefix, name): ftype.get_c_name('*tmp', f'field {fname!r}', quals=fqual), fname)) except VerificationError as e: - prnt(f' /* {str(e)} */') # cannot verify it, ignore + prnt(f' /* {e} */') # cannot verify it, ignore prnt('}') self.export_symbols.append(layoutfuncname) prnt(f'intptr_t {layoutfuncname}(intptr_t i)') diff --git a/testing/cffi1/test_re_python.py b/testing/cffi1/test_re_python.py index 4b597001..c8625e21 100644 --- a/testing/cffi1/test_re_python.py +++ b/testing/cffi1/test_re_python.py @@ -50,7 +50,7 @@ def setup_module(mod): except UnicodeEncodeError: name = None if name is not None: - print(f'{repr(outputfilename)} ==> {repr(name)}') + print(f'{outputfilename!r} ==> {name!r}') os.rename(outputfilename, name) outputfilename = name From c8b81395481d98f8ad6dbbdc84a56f9efa71f27a Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Wed, 18 Nov 2026 15:43:18 +0100 Subject: [PATCH 16/17] Apply ruff rule RUF012 Mutable default value for class attribute --- src/cffi/recompiler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cffi/recompiler.py b/src/cffi/recompiler.py index 2ddcf8ba..abbaecee 100644 --- a/src/cffi/recompiler.py +++ b/src/cffi/recompiler.py @@ -244,7 +244,7 @@ def _generate(self, step_name): # ---------- - ALL_STEPS = ["global", "field", "struct_union", "enum", "typename"] + ALL_STEPS = ("global", "field", "struct_union", "enum", "typename") def collect_step_tables(self): # collect the declarations for '_cffi_globals', '_cffi_typenames', etc. From 9e564f4751294312c544835494bb3fd444d4519c Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Wed, 18 Nov 2026 15:44:17 +0100 Subject: [PATCH 17/17] Apply ruff rule RUF023 `__slots__` is not sorted --- src/cffi/backend_ctypes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cffi/backend_ctypes.py b/src/cffi/backend_ctypes.py index 37a217cc..faca5537 100644 --- a/src/cffi/backend_ctypes.py +++ b/src/cffi/backend_ctypes.py @@ -833,7 +833,7 @@ def new_function_type(self, BArgs, BResult, has_varargs): nameargs = ', '.join(nameargs) # class CTypesFunctionPtr(CTypesGenericPtr): - __slots__ = ['_own_callback', '_name'] + __slots__ = ['_name', '_own_callback'] _ctype = ctypes.CFUNCTYPE(getattr(BResult, '_ctype', None), *[BArg._ctype for BArg in BArgs], use_errno=True)