Extract _try_decode function

1 files changed, 15 insertions, 11 deletions

diff --git a/cherrypy/lib/auth_basic.py b/cherrypy/lib/auth_basic.py
index 59e95f3c..45f6227d 100644
--- a/cherrypy/lib/auth_basic.py
+++ b/cherrypy/lib/auth_basic.py
@@ -83,19 +83,10 @@ def basic_auth(realm, checkpassword, debug=False, accept_charset='utf-8'):
         with cherrypy.HTTPError.handle((ValueError, binascii.Error), 400, msg):
             scheme, params = auth_header.split(' ', 1)
             if scheme.lower() == 'basic':
+                charsets = accept_charset, fallback_charset
                 decoded_params = base64_decode(params)
                 decoded_params = ntob(decoded_params)
-
-                last_err = None
-                for charset in (accept_charset, fallback_charset):
-                    try:
-                        decoded_params = tonative(decoded_params, charset)
-                        break
-                    except ValueError as ve:
-                        last_err = ve
-                else:
-                    raise last_err
-
+                decoded_params = _try_decode(decoded_params, charsets)
                 decoded_params = ntou(decoded_params)
                 decoded_params = unicodedata.normalize('NFC', decoded_params)
                 decoded_params = tonative(decoded_params)
@@ -118,3 +109,16 @@ def basic_auth(realm, checkpassword, debug=False, accept_charset='utf-8'):
     )
     raise cherrypy.HTTPError(
         401, 'You are not authorized to access that resource')
+
+
+def _try_decode(subject, charsets):
+    last_err = None
+    for charset in charsets:
+        try:
+            subject = tonative(subject, charset)
+            break
+        except ValueError as ve:
+            last_err = ve
+    else:
+        raise last_err
+    return subject