Keep removing Python pre-3.9 code by DimitriPapadopoulos · Pull Request #218 · python-cffi/cffi

DimitriPapadopoulos · 2025-12-10T17:43:58Z

Companion to #124 and #214.

Apply rule UP036, it implies lots of manual changes and requires extra care.

~~Needs #214 to be applied first.~~

mattip

I actually read the whole thing and only had two nits

mattip · 2026-03-26T11:26:50Z

-        import __builtin__
-    except ImportError:
-        import builtins as __builtin__
+    import builtins


I think this can be removed?

mattip · 2026-03-26T11:39:57Z

+try:
+    from _thread import allocate_lock
+except ImportError:
+    from _dummy_thread import allocate_lock


When might this fail? I think _thread is required for Python now.

Indeed _threadhas always been part of Python 3.

MLopez-Ibanez · 2026-04-29T10:36:01Z

This may need to be rebased and retested.

DimitriPapadopoulos · 2026-04-29T17:20:23Z

Yes, this is still a work in progress. Some changes break CI. I need to apply smaller change sets gradually — after rebasing.

DimitriPapadopoulos · 2026-10-26T00:24:43Z

More changes are needed, such as getting rid of tests of old versions of MSVC (2010 or 2013), or references to Python 2.7 in the documentation. I'd rather leave such changes for later PRs.

DimitriPapadopoulos · 2026-10-27T22:45:29Z

Rebased - painfully 😄

mattip · 2026-10-28T06:41:16Z

Now I have to go through the whole thing again. There were only two small nits 7 months ago, too bad it was not handled in a timely manner then.

DimitriPapadopoulos · 2026-10-28T08:39:58Z

I'm sorry about it. It was still a draft at the time, it took me quite some time to iron our small issues and make sure all changes are correct.

Both suggestions have been taken into account:

https://github.com/DimitriPapadopoulos/cffi/blob/959b327be21d11f2a2bf1a2f5315494d31f2422f/src/c/test_c.py#L2418-L2419
```
def test_buffer():
    BShort = new_primitive_type("short")
```
https://github.com/DimitriPapadopoulos/cffi/blob/959b327be21d11f2a2bf1a2f5315494d31f2422f/src/cffi/lock.py#L2-L4
```
from _thread import allocate_lock
```

These are automatic fixes using: * `--select UP036 --fix --unsafe-fixes`

These are manual fixes of testing/conftest.py

These are manual fixes of testing/udir.py

These are manual fixes of testing/embedding/

These are manual fixes of testing/cffi1/

These are manual fixes of testing/cffi0/

These are manual fixes of testing/support.py

These are manual fixes of src/c/test_c.py Co-Authored-By: mattip <matti.picus@gmail.com>

These are manual fixes of src/cffi/ Co-Authored-By: mattip <matti.picus@gmail.com>

These are manual fixes of src/c/ wchar_helper_3.h → wchar_helper.h

DimitriPapadopoulos force-pushed the UP036 branch 3 times, most recently from e01b11a to 527949f Compare December 11, 2025 21:03

DimitriPapadopoulos force-pushed the UP036 branch from 527949f to 36da74b Compare January 16, 2026 17:08

DimitriPapadopoulos force-pushed the UP036 branch 2 times, most recently from 1f2f72b to aaa88ae Compare March 25, 2026 15:10

mattip reviewed Mar 26, 2026

View reviewed changes

DimitriPapadopoulos force-pushed the UP036 branch from aaa88ae to d7797c5 Compare March 27, 2026 16:33

DimitriPapadopoulos marked this pull request as ready for review March 27, 2026 16:33

DimitriPapadopoulos force-pushed the UP036 branch 3 times, most recently from 2b0bbe5 to b594ec7 Compare March 30, 2026 22:37

DimitriPapadopoulos changed the title ~~Keep removing pre-Python 3.8 code~~ Keep removing pre-Python 3.9 code Mar 30, 2026

DimitriPapadopoulos force-pushed the UP036 branch 3 times, most recently from 190b007 to 95033ea Compare March 30, 2026 22:40

DimitriPapadopoulos marked this pull request as draft March 30, 2026 22:40

DimitriPapadopoulos force-pushed the UP036 branch from 95033ea to fe23206 Compare March 30, 2026 22:42

DimitriPapadopoulos force-pushed the UP036 branch 2 times, most recently from 2240429 to 938ddcd Compare April 29, 2026 18:05

DimitriPapadopoulos marked this pull request as ready for review July 19, 2026 19:56

DimitriPapadopoulos force-pushed the UP036 branch from 938ddcd to 32e1e17 Compare July 19, 2026 20:33

DimitriPapadopoulos marked this pull request as draft July 19, 2026 20:33

DimitriPapadopoulos force-pushed the UP036 branch 2 times, most recently from 8c5ba8e to 548326f Compare July 19, 2026 21:42

DimitriPapadopoulos changed the title ~~Keep removing pre-Python 3.9 code~~ Keep removing Python pre-3.9 code Jul 19, 2026

DimitriPapadopoulos force-pushed the UP036 branch 2 times, most recently from ee3070f to 2de1e2b Compare July 20, 2026 07:57

DimitriPapadopoulos force-pushed the UP036 branch 2 times, most recently from 91e3386 to 91dbf49 Compare October 26, 2026 00:15

DimitriPapadopoulos marked this pull request as ready for review October 26, 2026 00:17

DimitriPapadopoulos force-pushed the UP036 branch 4 times, most recently from c611bd9 to c4db10e Compare October 27, 2026 17:02

DimitriPapadopoulos marked this pull request as draft October 27, 2026 17:09

DimitriPapadopoulos force-pushed the UP036 branch 4 times, most recently from 10e1c9f to 959b327 Compare October 27, 2026 22:19

DimitriPapadopoulos marked this pull request as ready for review October 27, 2026 22:46

DimitriPapadopoulos added 8 commits October 28, 2026 09:46

Remove reference to unicode strings from doc

2c5f79e

Apply ruff/pyupgrade rule UP036

5e238ee

These are automatic fixes using: * `--select UP036 --fix --unsafe-fixes`

Remove outdated Python pre-3.9 code

a9de8d1

These are manual fixes of testing/conftest.py

Remove outdated Python pre-3.9 code

5aa8dac

These are manual fixes of testing/udir.py

Remove outdated Python pre-3.9 code

b8f6df9

These are manual fixes of testing/embedding/

Remove outdated Python pre-3.9 code

9cc8be0

These are manual fixes of testing/cffi1/

Remove outdated Python pre-3.9 code

6b71827

These are manual fixes of testing/cffi0/

Remove outdated Python pre-3.9 code

2f092d9

These are manual fixes of testing/support.py

DimitriPapadopoulos force-pushed the UP036 branch from 959b327 to 021215a Compare October 28, 2026 08:46

DimitriPapadopoulos and others added 3 commits October 28, 2026 10:05

Remove outdated Python pre-3.9 code

a971768

These are manual fixes of src/c/test_c.py Co-Authored-By: mattip <matti.picus@gmail.com>

Remove outdated Python pre-3.9 code

371f16b

These are manual fixes of src/cffi/ Co-Authored-By: mattip <matti.picus@gmail.com>

Remove outdated Python pre-3.9 code

14b5c64

These are manual fixes of src/c/ wchar_helper_3.h → wchar_helper.h

DimitriPapadopoulos force-pushed the UP036 branch from 021215a to 14b5c64 Compare October 28, 2026 09:05

Navigation Menu

Repository navigation

Keep removing Python pre-3.9 code - #218

Keep removing Python pre-3.9 code#218
DimitriPapadopoulos wants to merge 11 commits into
python-cffi:mainfrom
DimitriPapadopoulos:UP036

DimitriPapadopoulos commented Dec 10, 2025 •

edited

Loading

Uh oh!

mattip left a comment

Uh oh!

mattip Mar 26, 2026

Uh oh!

mattip Mar 26, 2026

Uh oh!

DimitriPapadopoulos Mar 27, 2026

Uh oh!

MLopez-Ibanez commented Apr 29, 2026

Uh oh!

DimitriPapadopoulos commented Apr 29, 2026

Uh oh!

DimitriPapadopoulos commented Oct 26, 2026

Uh oh!

DimitriPapadopoulos commented Oct 27, 2026

Uh oh!

mattip commented Oct 28, 2026

Uh oh!

DimitriPapadopoulos commented Oct 28, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

DimitriPapadopoulos commented Dec 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mattip left a comment

Choose a reason for hiding this comment

Uh oh!

mattip Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

mattip Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

DimitriPapadopoulos Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

MLopez-Ibanez commented Apr 29, 2026

Uh oh!

DimitriPapadopoulos commented Apr 29, 2026

Uh oh!

DimitriPapadopoulos commented Oct 26, 2026

Uh oh!

DimitriPapadopoulos commented Oct 27, 2026

Uh oh!

mattip commented Oct 28, 2026

Uh oh!

DimitriPapadopoulos commented Oct 28, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

DimitriPapadopoulos commented Dec 10, 2025 •

edited

Loading