Start removing pre-Python 3.8 code#214
Merged
mattip merged 14 commits intopython-cffi:mainfrom Dec 11, 2025
Merged
Conversation
DimitriPapadopoulos
force-pushed
the
python3
branch
2 times, most recently
from
3b1f85e to
a8a370b
Compare
This was referenced Dec 1, 2025
Contributor
|
|
DimitriPapadopoulos
force-pushed
the
python3
branch
from
e6b6b6d to
3e63ada
Compare
Contributor
|
Actually, I don't mind looking at this as one big PR. But #124 should go in first. |
Contributor
|
#124 is in. Want to take off the "Draft" status? |
mattip
reviewed
Dec 8, 2025
src/cffi/api.py
Outdated
| @@ -7,7 +7,7 @@ | |||
| callable | |||
| except NameError: | |||
| # Python 3.1 | |||
Contributor
There was a problem hiding this comment.
Suggested change
| # Python 3.1 |
mattip
reviewed
Dec 8, 2025
src/cffi/recompiler.py
Outdated
| if isinstance(s, unicode): | ||
| s = s.encode('ascii') | ||
| super(NativeIO, self).write(s) | ||
| NativeIO = io.StringIO |
Contributor
There was a problem hiding this comment.
Could probably refactor out NativeIO
mattip
reviewed
Dec 8, 2025
src/cffi/vengine_gen.py
Outdated
Comment on lines
58
to
60
| prefix = 'PyInit_' | ||
| modname = self.verifier.get_module_name() | ||
| prnt("void %s%s(void) { }\n" % (prefix, modname)) |
Contributor
There was a problem hiding this comment.
What about
Suggested change
| prefix = 'PyInit_' | |
| modname = self.verifier.get_module_name() | |
| prnt("void %s%s(void) { }\n" % (prefix, modname)) | |
| modname = self.verifier.get_module_name() | |
| prnt(f"void PyInit_{modname}(void) {{ }}\n") |
mattip
reviewed
Dec 8, 2025
Contributor
mattip
left a comment
mattip
left a comment
There was a problem hiding this comment.
There is a lot here, and probably a lot more to do. It is fine to do this in a couple of PRs though, we don't have to get it all in one PR.
Contributor
Author
|
Yes, I'm mostly applying pyupgrade and refurb ruff rules, to handle everything that can be fixed or at least detected automatically. I was thinking of starting a manual pass once this PR is in. But sure, I can apply the above suggestions. Still haven't applied UP030, UP031, UP032. I suggest a dedicated PR for these rules. |
DimitriPapadopoulos
force-pushed
the
python3
branch
from
3e63ada to
1f61c83
Compare
DimitriPapadopoulos
force-pushed
the
python3
branch
7 times, most recently
from
2bc183e to
d396812
Compare
Contributor
Author
DimitriPapadopoulos
force-pushed
the
python3
branch
from
d396812 to
d499d89
Compare
UP004 Class inherits from `object`
UP008 Use `super()` instead of `super(__class__, self)`
UP009 UTF-8 encoding declaration is unnecessary
UP010 Unnecessary `__future__` import for target Python version Manually removed comments about Unicode literals.
In Python 3, `io.open` is an alias for `open`. This is a manual change, not detected by ruff.
UP024 Replace aliased errors with `OSError`
UP025 Remove unicode literals from strings
UP028 Replace `yield` over `for` loop with `yield from`
UP035 Import from `collections.abc` instead: `Callable` Co-authored-by: Matti Picus <matti.picus@gmail.com>
FURB129 Instead of calling `readlines()`, iterate over file object directly
FURB188 Prefer `str.removeprefix()` over conditionally replacing with slice.
E703 Statement ends with an unnecessary semicolon
E711 Comparison to `None` should be `cond is not None`
E713 Test for membership should be `not in`
DimitriPapadopoulos
force-pushed
the
python3
branch
from
d499d89 to
fc735bf
Compare
Contributor
Author
|
Rebased and deferred UP036 to a PR of its own. |
DimitriPapadopoulos
changed the title
Contributor
|
Thanks @DimitriPapadopoulos |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Companion to #124.
Mostly applied ruff pyupgrade (UP) rules, and some pycodestyle (E) and refurb (FURB) rules.
Edit: I have left out some pyupgrade (UP) rules: