Use environ.get instead of try/except

2014-02-05 13:01:49 +01:00 · 2014-02-05 13:01:49 +01:00 · 701df2d201
commit 701df2d201
parent f7c7746643
1 changed files with 1 additions and 4 deletions
--- a/radicale/init.py
+++ b/radicale/init.py
@ -275,11 +275,8 @@ class Application(object):
            user, password = self.decode(base64.b64decode(
                authorization.encode("ascii")), environ).split(":", 1)
        else:
+            user = environ.get("REMOTE_USER")
            password = None
-            try:
-                user = environ["REMOTE_USER"]
-            except KeyError:
-                user = None

        is_authenticated = auth.is_authenticated(user, password)
        is_valid_user = is_authenticated or not user