restore out-of-bounds tests & improve range notation

Author: AA-Turner

Lib/test/test_zstd.py

@@ -200,16 +200,16 @@ 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 = 'compression level {} not in valid range -131072 <= level <= 22'
+        msg = 'illegal compression level {}; the valid range is [-131072, 22]'
         with self.assertRaisesRegex(ValueError, msg.format(C_INT_MAX)):
             ZstdCompressor(C_INT_MAX)
         with self.assertRaisesRegex(ValueError, msg.format(C_INT_MIN)):
             ZstdCompressor(C_INT_MIN)
-        msg = 'compression level not in valid range -131072 <= level <= 22'
+        msg = 'illegal compression level; the valid range is [-131072, 22]'
         with self.assertRaisesRegex(ValueError, msg):
             ZstdCompressor(level=-(2**1000))
         with self.assertRaisesRegex(ValueError, msg):
-            ZstdCompressor(level=(2**1000))
+            ZstdCompressor(level=2**1000)
 
         with self.assertRaises(ValueError):
             ZstdCompressor(options={CompressionParameter.window_log: 100})
@@ -305,7 +305,7 @@ def test_compress_parameters(self):
         with self.assertRaisesRegex(
             ValueError,
             "compression parameter 'window_log' received an illegal value 100; "
-            r'the valid range is \d+ <= value <= \d+',
+            r'the valid range is \[\d+, \d+\]',
         ):
             compress(b'', options=option)
 
@@ -439,10 +439,17 @@ def test_decompress_parameters(self):
 
         d1 = d.copy()
         # larger than signed int
+        d1[DecompressionParameter.window_log_max] = 2**1000
+        with self.assertRaises(OverflowError):
+            ZstdDecompressor(None, d1)
+        # smaller than signed int
+        d1[DecompressionParameter.window_log_max] = -(2**1000)
+        with self.assertRaises(OverflowError):
+            ZstdDecompressor(None, d1)
+
         d1[DecompressionParameter.window_log_max] = C_INT_MAX
         with self.assertRaises(ValueError):
             ZstdDecompressor(None, d1)
-        # smaller than signed int
         d1[DecompressionParameter.window_log_max] = C_INT_MIN
         with self.assertRaises(ValueError):
             ZstdDecompressor(None, d1)
@@ -452,7 +459,7 @@ def test_decompress_parameters(self):
         with self.assertRaisesRegex(
             ValueError,
             "decompression parameter 'window_log_max' received an illegal value 100; "
-            r'the valid range is \d+ <= value <= \d+',
+            r'the valid range is \[\d+, \d+\]',
         ):
             decompress(b'', options=options)
 

Modules/_zstd/_zstdmodule.c

@@ -154,7 +154,7 @@ set_parameter_error(int is_compress, int key_v, int value_v)
     /* Error message */
     PyErr_Format(PyExc_ValueError,
         "%s parameter '%s' received an illegal value %d; "
-        "the valid range is %d <= value <= %d",
+        "the valid range is [%d, %d]",
         type, name, value_v, bounds.lowerBound, bounds.upperBound);
 }
 

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,
-        "compression level %d not in valid range %d <= level <= %d",
+        "illegal compression level %d; the valid range is [%d, %d]",
             level, min_level, max_level);
         return -1;
     }
@@ -378,7 +378,7 @@ _zstd_ZstdCompressor_new_impl(PyTypeObject *type, PyObject *level,
         if (level_v == -1 && PyErr_Occurred()) {
             if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
                 PyErr_Format(PyExc_ValueError,
-                    "compression level not in valid range %d <= level <= %d",
+                    "illegal compression level; the valid range is [%d, %d]",
                     ZSTD_minCLevel(), ZSTD_maxCLevel());
             }
             goto error;