Merge remote-tracking branch 'upstream/main' into zstd-set-params

# Conflicts: # Modules/_zstd/compressor.c
python · AA-Turner · May 28, 2025 · May 11, 2025 · May 24, 2025 · May 24, 2025
commit 6f58a95725ca29717631ce1106d643c9f02c7fc5
diff --git a/Modules/_zstd/compressor.c b/Modules/_zstd/compressor.c
@@ -107,7 +107,8 @@ _zstd_set_c_parameters(ZstdCompressor *self, PyObject *options)
         const int key_v = PyLong_AsInt(key);
         if (key_v == -1 && PyErr_Occurred()) {
             PyErr_SetString(PyExc_ValueError,
-                            "key should be a CompressionParameter attribute.");
+                            "key should be either a "
+                                "CompressionParameter attribute or an int.");
             return -1;
         }
 
@@ -364,7 +365,8 @@ _zstd_ZstdCompressor_new_impl(PyTypeObject *type, Py_ssize_t level,
     self->last_mode = ZSTD_e_end;
 
     if (level != PY_SSIZE_T_MIN && options != Py_None) {
-        PyErr_SetString(PyExc_RuntimeError, "Only one of level or options should be used.");
+        PyErr_SetString(PyExc_RuntimeError,
+                        "Only one of level or options should be used.");
         goto error;
     }