f

Author: mayeut

base64

@@ -887,6 +887,9 @@ static PyObject* pybase64_decode_impl(PyObject* self, PyObject* args, PyObject *
         case BASE64_DECODE_ERROR_PADDING_BITS_NOT_ALLOWED:
             PyErr_SetString(state->binAsciiError, "Non-zero padding bits");
             break;
+        case BASE64_DECODE_ERROR_NON_ASCII:
+            PyErr_SetString(PyExc_ValueError, "string argument should contain only ASCII characters");
+            break;
         }
         goto EXCEPT;
     }

src/pybase64/_pybase64.c

@@ -387,17 +387,17 @@ def test_invalid_altchars_dec_validate(
 
 
 params_invalid_data_novalidate_values = [
-    [b"A@@@@FG", None, BinAsciiError, "Incorrect padding|Non-base64 digit found|Only base64 data"],
-    ["ABC€", None, ValueError, "ASCII"],
-    [3.0, None, TypeError, "bytes-like|buffer interface"],
-    [memoryview(b"ABCDEFGH")[::2], None, BufferError, "contiguous"],
-    ["a\x80aa", None, ValueError, "ASCII|Non-base64 digit found"],
-    [b"a\x80aa", None, BinAsciiError, "Incorrect padding|Non-base64 digit found|Only base64 data"],
-    ["a\x80aaa", None, ValueError, "ASCII|Non-base64 digit found"],
-    [b"ab", None, BinAsciiError, "Incorrect padding"],
-    [b"abc", None, BinAsciiError, "Incorrect padding"],
-    [b"ab=", None, BinAsciiError, "Incorrect padding"],
-    [b"ab==c", None, BinAsciiError, "Incorrect padding|Excess data after"],
+    [b"A@@@@FG", None, BinAsciiError, r"Incorrect padding|Non-base64 digit found|Only base64 data"],
+    ["ABC€", None, ValueError, re.escape("only ASCII characters")],
+    [3.0, None, TypeError, r"bytes-like|buffer interface"],
+    [memoryview(b"ABCDEFGH")[::2], None, BufferError, re.escape("contiguous")],
+    ["a\x80aa", None, ValueError, re.escape("only ASCII characters")],
+    [b"a\x80aa", None, BinAsciiError, r"Incorrect padding|Non-base64 digit found|Only base64 data"],
+    ["a\x80aaa", None, ValueError, re.escape("only ASCII characters")],
+    [b"ab", None, BinAsciiError, re.escape("Incorrect padding")],
+    [b"abc", None, BinAsciiError, re.escape("Incorrect padding")],
+    [b"ab=", None, BinAsciiError, re.escape("Incorrect padding")],
+    [b"ab==c", None, BinAsciiError, r"Incorrect padding|Excess data after"],
 ]
 params_invalid_data_validate_values = [
     [b"\x00\x00\x00\x00", None, BinAsciiError, None],
@@ -407,7 +407,12 @@ def test_invalid_altchars_dec_validate(
     [b"A@@@@FGHIJKLMNOPQRSTUVWXYZabcde@=", b"-_", BinAsciiError, None],
     [b"A@@@@FGHIJKLMNOPQRSTUVWXYZabcd@==", b"-_", BinAsciiError, None],
     [b"A@@@@FGH" * 10000, b"-_", BinAsciiError, None],
-    [b"a\x80aaa", None, BinAsciiError, "Incorrect padding|Non-base64 digit found|Only base64 data"],
+    [
+        b"a\x80aaa",
+        None,
+        BinAsciiError,
+        r"Incorrect padding|Non-base64 digit found|Only base64 data",
+    ],
 ]
 params_invalid_data_all = pytest.mark.parametrize(
     ("vector", "altchars", "exception", "match"),
@@ -815,7 +820,7 @@ def test_ignorechars_invalid(simd: int) -> None:
     msg = re.escape("validate must be True or unspecified when ignorechars is specified")
     with pytest.raises(ValueError, match=msg):
         pybase64.b64decode(b"", validate=False, ignorechars=b"")
-    with pytest.raises(ValueError, match=r"ASCII|Non-base64 digit found"):
+    with pytest.raises(ValueError, match=re.escape("only ASCII characters")):
         pybase64.b64decode("YW\x80Jj", ignorechars=b"\x80")