8000 gh-132983: Clean-ups for `_zstd` by AA-Turner · Pull Request #133670 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-132983: Clean-ups for _zstd #133670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
May 9, 2025
Merged

gh-132983: Clean-ups for _zstd #133670

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0c3c667
zstd: replace star import with explicit names
AA-Turner May 8, 2025
e02f66c
zstd: factor common parts of set_zstd_error()
AA-Turner May 8, 2025
686ae61
zstd: Remove ZSTD_versionString from error messages
AA-Turner May 8, 2025
7ea1ac1
zstd: Simplify version_info setup
AA-Turner May 8, 2025
9774338
zstd: Replace _compressionLevel_values with ZSTD_CLEVEL_DEFAULT
AA-Turner May 8, 2025
d1dea98
zstd: Remove _ZSTD_CStreamSizes, replace _ZSTD_DStreamSizes with ZSTD…
AA-Turner May 8, 2025
ac1e39c
zstd: Remove _ZSTD_CONFIG
AA-Turner May 8, 2025
1a54bf3
zstd: Replace add_parameters and ADD_INT_PREFIX_MACRO with PyModule_A…
AA-Turner May 8, 2025
9cb7a3d
Merge branch 'main' into zstd-clean
AA-Turner May 8, 2025
663e666
Revert "zstd: factor common parts of set_zstd_error()"
AA-Turner May 8, 2025
dd1380d
Use PyModule_Add
AA-Turner May 9, 2025
fcd6561
Check failure cases for int macros
AA-Turner May 9, 2025
06a4723
Remove ERR_SET_PLEDGED_INPUT_SIZE
AA-Turner May 9, 2025
ef2634d
Use PyLong_FromSize_t
AA-Turner May 9, 2025
ff28bf2
Use runtime version
AA-Turner May 9, 2025
3d3dbf7
Calculate zstd_version_info in Python
AA-Turner May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8000
Prev Previous commit
Next Next commit
zstd: Remove ZSTD_versionString from error messages
  • Loading branch information
@AA-Turner
AA-Turner committed May 8, 2025
commit 686ae618680dcac5d33506912689884db138ffbf
4 changes: 2 additions & 2 deletions Lib/test/test_zstd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ def test_compress_parameters(self):
with self.assertRaisesRegex(ZstdError,
(r'Error when setting zstd compression parameter "window_log", '
r'it should \d+ <= value <= \d+, provided value is 100\. '
r'\(zstd v\d\.\d\.\d, (?:32|64)-bit build\)')):
r'\((?:32|64)-bit build\)')):
compress(b'', options=option)

def test_unknown_compression_parameter(self):
Expand Down Expand Up @@ -413,7 +413,7 @@ def test_decompress_parameters(self):
with self.assertRaisesRegex(ZstdError,
(r'Error when setting zstd decompression parameter "window_log_max", '
r'it should \d+ <= value <= \d+, provided value is 100\. '
r'\(zstd v\d\.\d\.\d, (?:32|64)-bit build\)')):
r'\((?:32|64)-bit build\)')):
decompress(b'', options=options)

def test_unknown_decompression_parameter(self):
Expand Down
8 changes: 4 additions & 4 deletions Modules/_zstd/_zstdmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,19 +152,19 @@ set_parameter_error(const _zstd_state* const state, int is_compress,
}
if (ZSTD_isError(bounds.error)) {
PyErr_Format(state->ZstdError,
"Zstd %s parameter \"%s\" is invalid. (zstd v%s)",
type, name, ZSTD_versionString());
"Zstd %s parameter \"%s\" is invalid.",
type, name);
return;
}

/* Error message */
PyErr_Format(state->ZstdError,
"Error when setting zstd %s parameter \"%s\", it "
"should %d <= value <= %d, provided value is %d. "
"(zstd v%s, %d-bit build)",
"(%d-bit build)",
type, name,
bounds.lowerBound, bounds.upperBound, value_v,
ZSTD_versionString(), 8*(int)sizeof(Py_ssize_t));
8*(int)sizeof(Py_ssize_t));
}

static inline _zstd_state*
Expand Down
0