error messages

Author: AA-Turner

Lib/test/test_zstd.py

@@ -200,7 +200,7 @@ def test_simple_compress_bad_args(self):
         self.assertRaises(TypeError, ZstdCompressor, zstd_dict={1: 2, 3: 4})
 
         # valid range for compression level is [-(1<<17), 22]
-        msg = '{} not in valid range -131072 <= compression level <= 22'
+        msg = 'compression level {} not in valid range -131072 <= level <= 22'
         with self.assertRaisesRegex(ValueError, msg.format(C_INT_MAX)):
             ZstdCompressor(C_INT_MAX)
         with self.assertRaisesRegex(ValueError, msg.format(C_INT_MIN)):
@@ -304,8 +304,8 @@ def test_compress_parameters(self):
         option = {CompressionParameter.window_log:100}
         with self.assertRaisesRegex(
             ValueError,
-            r"100 not in valid range \d+ <= value <= \d+ for compression "
-            r"parameter 'window_log'",
+            "compression parameter 'window_log' received an illegal value 100; "
+            r'the valid range is \d+ <= value <= \d+',
         ):
             compress(b'', options=option)
 
@@ -451,8 +451,8 @@ def test_decompress_parameters(self):
         options = {DecompressionParameter.window_log_max:100}
         with self.assertRaisesRegex(
             ValueError,
-            r"100 not in valid range \d+ <= value <= \d+ for decompression "
-            r"parameter 'window_log_max'",
+            "decompression parameter 'window_log_max' received an illegal value 100; "
+            r'the valid range is \d+ <= value <= \d+',
         ):
             decompress(b'', options=options)
 

Modules/_zstd/_zstdmodule.c

@@ -153,8 +153,9 @@ set_parameter_error(int is_compress, int key_v, int value_v)
 
     /* Error message */
     PyErr_Format(PyExc_ValueError,
-        "%d not in valid range %d <= value <= %d for %s parameter '%s'",
-        value_v, bounds.lowerBound, bounds.upperBound, type, name);
+        "%s parameter '%s' received an illegal value %d; "
+        "the valid range is %d <= value <= %d",
+        type, name, value_v, bounds.lowerBound, bounds.upperBound);
 }
 
 static inline _zstd_state*

Modules/_zstd/compressor.c

@@ -56,7 +56,7 @@ _zstd_set_c_level(ZstdCompressor *self, int level)
     int max_level = ZSTD_maxCLevel();
     if (level < min_level || level > max_level) {
         PyErr_Format(PyExc_ValueError,
-        "%d not in valid range %d <= compression level <= %d",
+        "compression level %d not in valid range %d <= level <= %d",
             level, min_level, max_level);
         return -1;
     }