summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSviatoslav Sydorenko <wk@sydorenko.org.ua>2018-04-22 05:15:30 +0200
committerSviatoslav Sydorenko <wk@sydorenko.org.ua>2018-04-22 05:15:30 +0200
commit8583123385fcfb9aabd2a74fdaf4e5fb45ae3df5 (patch)
tree18fcce0a33b2820cca2429cf69813e3655cd447a
parentc62d90e9ae85df46ceb21ee4b1520296fa42ad4c (diff)
downloadcherrypy-git-bugfix/1680-unicode-in-http-auth-backup.tar.gz
Drop unneeded to_native_or_nonebugfix/1680-unicode-in-http-auth-backup
-rw-r--r--cherrypy/lib/auth_digest.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/cherrypy/lib/auth_digest.py b/cherrypy/lib/auth_digest.py
index ecd07f93..e3f1c762 100644
--- a/cherrypy/lib/auth_digest.py
+++ b/cherrypy/lib/auth_digest.py
@@ -143,13 +143,10 @@ def H(s):
def _try_decode_map_values(param_map, charset):
global FALLBACK_CHARSET
- def to_native_or_none(v, enc):
- return tonative(v, enc) if v is not None else v
-
for enc in (charset, FALLBACK_CHARSET):
try:
return {
- k: to_native_or_none(v, enc)
+ k: tonative(v, enc)
for k, v in param_map.items()
}
except ValueError as ve: