Remaining asserts

Author: StanFromIreland

Lib/encodings/base64_codec.py

@@ -8,16 +8,20 @@
 import codecs
 import base64
 
-### Codec APIs
+### Codec Helpers
 
-def base64_encode(input, errors='strict'):
+def _assert_strict(errors):
     if errors != 'strict':
         raise ValueError(f'Unsupported error handling mode: "{errors}" - must be "strict"')
+
+### Codec APIs
+
+def base64_encode(input, errors='strict'):
+    _assert_strict(errors)
     return (base64.encodebytes(input), len(input))
 
 def base64_decode(input, errors='strict'):
-    if errors != 'strict':
-        raise ValueError(f'Unsupported error handling mode: "{errors}" - must be "strict"')
+    _assert_strict(errors)
     return (base64.decodebytes(input), len(input))
 
 class Codec(codecs.Codec):
@@ -28,12 +32,12 @@ def decode(self, input, errors='strict'):
 
 class IncrementalEncoder(codecs.IncrementalEncoder):
     def encode(self, input, final=False):
-        assert self.errors == 'strict'
+        _assert_strict(self.errors)
         return base64.encodebytes(input)
 
 class IncrementalDecoder(codecs.IncrementalDecoder):
     def decode(self, input, final=False):
-        assert self.errors == 'strict'
+        _assert_strict(self.errors)
         return base64.decodebytes(input)
 
 class StreamWriter(Codec, codecs.StreamWriter):

Lib/encodings/hex_codec.py

@@ -8,16 +8,20 @@
 import codecs
 import binascii
 
-### Codec APIs
+### Codec Helpers
 
-def hex_encode(input, errors='strict'):
+def _assert_strict(errors):
     if errors != 'strict':
         raise ValueError(f'Unsupported error handling mode: "{errors}" - must be "strict"')
+
+### Codec APIs
+
+def hex_encode(input, errors='strict'):
+    _assert_strict(errors)
     return (binascii.b2a_hex(input), len(input))
 
 def hex_decode(input, errors='strict'):
-    if errors != 'strict':
-        raise ValueError(f'Unsupported error handling mode: "{errors}" - must be "strict"')
+    _assert_strict(errors)
     return (binascii.a2b_hex(input), len(input))
 
 class Codec(codecs.Codec):
@@ -28,12 +32,12 @@ def decode(self, input, errors='strict'):
 
 class IncrementalEncoder(codecs.IncrementalEncoder):
     def encode(self, input, final=False):
-        assert self.errors == 'strict'
+        _assert_strict(self.errors)
         return binascii.b2a_hex(input)
 
 class IncrementalDecoder(codecs.IncrementalDecoder):
     def decode(self, input, final=False):
-        assert self.errors == 'strict'
+        _assert_strict(self.errors)
         return binascii.a2b_hex(input)
 
 class StreamWriter(Codec, codecs.StreamWriter):

Lib/encodings/quopri_codec.py

@@ -7,17 +7,23 @@
 import quopri
 from io import BytesIO
 
-def quopri_encode(input, errors='strict'):
+### Codec Helpers
+
+def _assert_strict(errors):
     if errors != 'strict':
         raise ValueError(f'Unsupported error handling mode: "{errors}" - must be "strict"')
+
+### Codec APIs
+
+def quopri_encode(input, errors='strict'):
+    _assert_strict(errors)
     f = BytesIO(input)
     g = BytesIO()
     quopri.encode(f, g, quotetabs=True)
     return (g.getvalue(), len(input))
 
 def quopri_decode(input, errors='strict'):
-    if errors != 'strict':
-        raise ValueError(f'Unsupported error handling mode: "{errors}" - must be "strict"')
+    _assert_strict(errors)
     f = BytesIO(input)
     g = BytesIO()
     quopri.decode(f, g)

Lib/encodings/uu_codec.py

@@ -11,11 +11,16 @@
 import binascii
 from io import BytesIO
 
-### Codec APIs
+### Codec Helpers
 
-def uu_encode(input, errors='strict', filename='<data>', mode=0o666):
+def _assert_strict(errors):
     if errors != 'strict':
         raise ValueError(f'Unsupported error handling mode: "{errors}" - must be "strict"')
+
+### Codec APIs
+
+def uu_encode(input, errors='strict', filename='<data>', mode=0o666):
+    _assert_strict(errors)
     infile = BytesIO(input)
     outfile = BytesIO()
     read = infile.read
@@ -36,8 +41,7 @@ def uu_encode(input, errors='strict', filename='<data>', mode=0o666):
     return (outfile.getvalue(), len(input))
 
 def uu_decode(input, errors='strict'):
-    if errors != 'strict':
-        raise ValueError(f'Unsupported error handling mode: "{errors}" - must be "strict"')
+    _assert_strict(errors)
     infile = BytesIO(input)
     outfile = BytesIO()
     readline = infile.readline

Lib/test/test_http_cookies.py

@@ -214,8 +214,9 @@ def test_set_secure_httponly_partitioned_attrs(self):
             'Set-Cookie: Customer="WILE_E_COYOTE"; HttpOnly; Partitioned; Secure')
 
     def test_samesite_attrs(self):
-        samesite_values = ['Strict', 'Lax', 'strict', 'lax']
+        samesite_values = ['Strict', 'Lax', 'strict', 'lax', 'None', 'none', 'asdasd']
         for val in samesite_values:
+            print(val)
             with self.subTest(val=val):
                 C = cookies.SimpleCookie('Customer="WILE_E_COYOTE"')
                 C['Customer']['samesite'] = val