◐ Shell
reader mode source ↗
Skip to content

gh-132983: Simplify _zstd_exec()#133775

Merged
AA-Turner merged 6 commits into
python:mainfrom
AA-Turner:zstd-exec
May 9, 2025
Merged

gh-132983: Simplify _zstd_exec()#133775
AA-Turner merged 6 commits into
python:mainfrom
AA-Turner:zstd-exec

Conversation

@AA-Turner

@AA-Turner AA-Turner commented May 9, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

cc @Rogdham (can't request review).

Follows on from #133670. Again best reviewed commit-by-commit. We remove around 100 lines of C code overall.

The last commit (6a3a135 (#133775)) only serves to merge two functions and contains no behaviour change, but does increase the diff size.

  • Rename type specs to add underscores after 'zstd'
  • Replace the add_type_to_module() function with an ADD_TYPE macro, using PyModule_AddType instead of PyModule_AddObjectRef.
  • Remove the unused 'empty_readonly_memoryview', 'str_flush', 'str_read', 'str_readinto', and 'str_write' module state members
  • Set the CONTINUE/FLUSH_* constants in Python rather than C. To achieve this, export the three ZSTD_EndDirective enum members from the _zstd module.

@AA-Turner AA-Turner requested a review from emmatyping May 9, 2025 16:29
@bedevere-app bedevere-app Bot mentioned this pull request May 9, 2025
Closed
13 tasks
picnixz
picnixz reviewed May 9, 2025
View reviewed changes

@picnixz picnixz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hide comment

Overall, I think it's a nice improvement but usually, C classes are read-only (e.g., _sha2.SHA2Type does not allow setting class variables afterwards; the same holds for lzma.LZMACompressor so it would be better to do the same for the Zstd* types)

serhiy-storchaka
serhiy-storchaka reviewed May 9, 2025
View reviewed changes

@serhiy-storchaka serhiy-storchaka left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hide comment

It would be better to make classes implemented in C immutable.

emmatyping
emmatyping approved these changes May 9, 2025
View reviewed changes

@emmatyping emmatyping left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hide comment

Thanks! These are great refactors.

picnixz
picnixz reviewed May 9, 2025
View reviewed changes

@picnixz picnixz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hide comment

You can add Py_TPFLAGS_IMMUTABLETYPE in this PR or in another.

Hide details View details @AA-Turner AA-Turner merged commit bbe9c31 into python:main May 9, 2025
42 checks passed
@AA-Turner AA-Turner deleted the zstd-exec branch May 9, 2025 19:15
@AA-Turner AA-Turner added the needs backport to 3.14 bugs and security fixes label May 9, 2025
@miss-islington-app

miss-islington-app Bot commented May 9, 2025

Copy link
Copy Markdown

Thanks @AA-Turner for the PR 🌮🎉.. I'm working now to backport this PR to: 3.14.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 9, 2025
@AA-Turner @miss-islington
pythongh-132983: Simplify _zstd_exec() (pythonGH-133775) …
d15236e 
(cherry picked from commit bbe9c31)

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
@bedevere-app

bedevere-app Bot commented May 9, 2025

Copy link
Copy Markdown

GH-133786 is a backport of this pull request to the 3.14 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.14 bugs and security fixes label May 9, 2025
AA-Turner added a commit that referenced this pull request May 9, 2025
@miss-islington @AA-Turner
[3.14] gh-132983: Simplify _zstd_exec() (GH-133775) (#133786) …
5796e3b 
gh-132983: Simplify ``_zstd_exec()`` (GH-133775)
(cherry picked from commit bbe9c31)

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
Pranjal095 pushed a commit to Pranjal095/cpython that referenced this pull request Jul 12, 2025
@AA-Turner @Pranjal095
pythongh-132983: Simplify _zstd_exec() (python#133775)
7f6dc2b
taegyunkim pushed a commit to taegyunkim/cpython that referenced this pull request Aug 4, 2025
@AA-Turner @taegyunkim
pythongh-132983: Simplify _zstd_exec() (python#133775)
db9c2c5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@serhiy-storchaka serhiy-storchaka serhiy-storchaka left review comments

@emmatyping emmatyping

@picnixz picnixz picnixz approved these changes

Assignees

No one assigned

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@AA-Turner @serhiy-storchaka @emmatyping @picnixz