Indent s2repoze correctly

Signed-off-by: Ivan Kanakarakis <[email protected]>

Author: c00kiemon5ter

src/saml2/s2repoze/plugins/challenge_decider.py

@@ -9,74 +9,78 @@
 import re
 
 _DAV_METHODS = (
-    'OPTIONS',
-    'PROPFIND',
-    'PROPPATCH',
-    'MKCOL',
-    'LOCK',
-    'UNLOCK',
-    'TRACE',
-    'DELETE',
-    'COPY',
-    'MOVE'
-    )
+    "OPTIONS",
+    "PROPFIND",
+    "PROPPATCH",
+    "MKCOL",
+    "LOCK",
+    "UNLOCK",
+    "TRACE",
+    "DELETE",
+    "COPY",
+    "MOVE",
+)
 
 _DAV_USERAGENTS = (
-    'Microsoft Data Access Internet Publishing Provider',
-    'WebDrive',
-    'Zope External Editor',
-    'WebDAVFS',
-    'Goliath',
-    'neon',
-    'davlib',
-    'wsAPI',
-    'Microsoft-WebDAV'
-    )
+    "Microsoft Data Access Internet Publishing Provider",
+    "WebDrive",
+    "Zope External Editor",
+    "WebDAVFS",
+    "Goliath",
+    "neon",
+    "davlib",
+    "wsAPI",
+    "Microsoft-WebDAV",
+)
+
 
 def my_request_classifier(environ):
     """ Returns one of the classifiers 'dav', 'xmlpost', or 'browser',
     depending on the imperative logic below"""
     request_method = REQUEST_METHOD(environ)
     if request_method in _DAV_METHODS:
-        return 'dav'
+        return "dav"
     useragent = USER_AGENT(environ)
     if useragent:
         for agent in _DAV_USERAGENTS:
             if useragent.find(agent) != -1:
-                return 'dav'
-    if request_method == 'POST':
-        if CONTENT_TYPE(environ) == 'text/xml':
-            return 'xmlpost'
+                return "dav"
+    if request_method == "POST":
+        if CONTENT_TYPE(environ) == "text/xml":
+            return "xmlpost"
         elif CONTENT_TYPE(environ) == "application/soap+xml":
-            return 'soap'
-    return 'browser'
+            return "soap"
+    return "browser"
+
 
 zope.interface.directlyProvides(my_request_classifier, IRequestClassifier)
 
+
 class MyChallengeDecider:
     def __init__(self, path_login="", path_logout=""):
         self.path_login = path_login
         self.path_logout = path_logout
+
     def __call__(self, environ, status, _headers):
-        if status.startswith('401 '):
+        if status.startswith("401 "):
             return True
         else:
-            if environ.has_key('samlsp.pending'):
+            if environ.has_key("samlsp.pending"):
                 return True
 
-            uri = environ.get('REQUEST_URI', None)
+            uri = environ.get("REQUEST_URI", None)
             if uri is None:
                 uri = construct_url(environ)
 
             # require and challenge for logout and inform the challenge plugin that it is a logout we want
             for regex in self.path_logout:
                 if regex.match(uri) is not None:
-                    environ['samlsp.logout'] = True
+                    environ["samlsp.logout"] = True
                     return True
 
             # If the user is already authent, whatever happens(except logout),
             #   don't make a challenge
-            if environ.has_key('repoze.who.identity'):
+            if environ.has_key("repoze.who.identity"):
                 return False
 
             # require a challenge for login
@@ -87,27 +91,24 @@ def __call__(self, environ, status, _headers):
         return False
 
 
-
-def make_plugin(path_login = None, path_logout = None):
+def make_plugin(path_login=None, path_logout=None):
     if path_login is None:
-        raise ValueError(
-            'must include path_login in configuration')
+        raise ValueError("must include path_login in configuration")
 
-# make regexp out of string passed via the config file
+    # make regexp out of string passed via the config file
     list_login = []
     for arg in path_login.splitlines():
         carg = arg.lstrip()
-        if carg != '':
+        if carg != "":
             list_login.append(re.compile(carg))
 
     list_logout = []
     if path_logout is not None:
         for arg in path_logout.splitlines():
             carg = arg.lstrip()
-            if carg != '':
+            if carg != "":
                 list_logout.append(re.compile(carg))
 
     plugin = MyChallengeDecider(list_login, list_logout)
 
     return plugin
-

src/saml2/s2repoze/plugins/entitlement.py

@@ -3,9 +3,10 @@
 
 from zope.interface import implements
 
-#from repoze.who.interfaces import IChallenger, IIdentifier, IAuthenticator
+# from repoze.who.interfaces import IChallenger, IIdentifier, IAuthenticator
 from repoze.who.interfaces import IMetadataProvider
 
+
 class EntitlementMetadataProvider(object):
 
     implements(IMetadataProvider)
@@ -43,7 +44,7 @@ def get_entitlement(self, user, virtualorg):
 
     def store_entitlement(self, user, virtualorg, entitlement=None):
         if user not in self._store:
-            self._store[user] = {"entitlement":{}}
+            self._store[user] = {"entitlement": {}}
         elif "entitlement" not in self._store[user]:
             self._store[user]["entitlement"] = {}
 
@@ -53,18 +54,17 @@ def store_entitlement(self, user, virtualorg, entitlement=None):
         self._store.sync()
 
     def add_metadata(self, environ, identity):
-        #logger = environ.get('repoze.who.logger','')
+        # logger = environ.get('repoze.who.logger','')
         try:
-            user = self._store[identity.get('repoze.who.userid')]
+            user = self._store[identity.get("repoze.who.userid")]
         except KeyError:
             return
 
         try:
             vorg = environ["myapp.vo"]
             try:
                 ents = user["entitlement"][vorg]
-                identity["user"] = {
-                            "entitlement": ["%s:%s" % (vorg,e) for e in ents]}
+                identity["user"] = {"entitlement": ["%s:%s" % (vorg, e) for e in ents]}
             except KeyError:
                 pass
         except KeyError:
@@ -73,5 +73,6 @@ def add_metadata(self, environ, identity):
                 res.extend(["%s:%s" % (vorg, e) for e in ents])
             identity["user"] = res
 
+
 def make_plugin(filename, key_attribute=""):
     return EntitlementMetadataProvider(filename, key_attribute)

src/saml2/s2repoze/plugins/formswithhidden.py

@@ -37,24 +37,26 @@
 
 HIDDEN_PRE_LINE = """<input type=hidden name="%s" value="%s">"""
 
+
 class FormHiddenPlugin(FormPlugin):
 
     implements(IChallenger, IIdentifier)
 
     # IIdentifier
     def identify(self, environ):
-        logger = environ.get('repoze.who.logger','')
+        logger = environ.get("repoze.who.logger", "")
         logger.info("formplugin identify")
-        #logger and logger.info("environ keys: %s", environ.keys())
+        # logger and logger.info("environ keys: %s", environ.keys())
         query = parse_dict_querystring(environ)
         # If the extractor finds a special query string on any request,
         # it will attempt to find the values in the input body.
         if query.get(self.login_form_qs):
             form = parse_formvars(environ)
             from StringIO import StringIO
+
             # we need to replace wsgi.input because we've read it
             # this smells funny
-            environ['wsgi.input'] = StringIO()
+            environ["wsgi.input"] = StringIO()
             form.update(query)
             qinfo = {}
             for key, val in form.items():
@@ -63,32 +65,31 @@ def identify(self, environ):
             if qinfo:
                 environ["s2repoze.qinfo"] = qinfo
             try:
-                login = form['login']
-                password = form['password']
+                login = form["login"]
+                password = form["password"]
             except KeyError:
                 return None
             del query[self.login_form_qs]
             query.update(qinfo)
-            environ['QUERY_STRING'] = urllib.urlencode(query)
-            environ['repoze.who.application'] = HTTPFound(
-                                                    construct_url(environ))
-            credentials = {'login':login, 'password':password}
-            max_age = form.get('max_age', None)
+            environ["QUERY_STRING"] = urllib.urlencode(query)
+            environ["repoze.who.application"] = HTTPFound(construct_url(environ))
+            credentials = {"login": login, "password": password}
+            max_age = form.get("max_age", None)
             if max_age is not None:
-                credentials['max_age'] = max_age
+                credentials["max_age"] = max_age
             return credentials
 
         return None
 
     # IChallenger
     def challenge(self, environ, status, app_headers, forget_headers):
-        logger = environ.get('repoze.who.logger','')
+        logger = environ.get("repoze.who.logger", "")
         logger.info("formplugin challenge")
         if app_headers:
             location = LOCATION(app_headers)
             if location:
                 headers = list(app_headers) + list(forget_headers)
-                return HTTPFound(headers = headers)
+                return HTTPFound(headers=headers)
 
         query = parse_dict_querystring(environ)
         hidden = []
@@ -101,23 +102,24 @@ def challenge(self, environ, status, app_headers, forget_headers):
 
         if self.formcallable is not None:
             form = self.formcallable(environ)
+
         def auth_form(environ, start_response):
             content_length = CONTENT_LENGTH.tuples(str(len(form)))
-            content_type = CONTENT_TYPE.tuples('text/html')
+            content_type = CONTENT_TYPE.tuples("text/html")
             headers = content_length + content_type + forget_headers
-            start_response('200 OK', headers)
+            start_response("200 OK", headers)
             return [form]
 
         return auth_form
 
 
-def make_plugin(login_form_qs='__do_login', rememberer_name=None, form=None):
+def make_plugin(login_form_qs="__do_login", rememberer_name=None, form=None):
     if rememberer_name is None:
         raise ValueError(
-            'must include rememberer key (name of another IIdentifier plugin)')
+            "must include rememberer key (name of another IIdentifier plugin)"
+        )
     if form is not None:
-        with open(form, 'r') as f:
+        with open(form, "r") as f:
             form = f.read()
     plugin = FormHiddenPlugin(login_form_qs, rememberer_name, form)
     return plugin
-

src/saml2/s2repoze/plugins/ini.py

@@ -2,9 +2,10 @@
 
 from zope.interface import implements
 
-#from repoze.who.interfaces import IChallenger, IIdentifier, IAuthenticator
+# from repoze.who.interfaces import IChallenger, IIdentifier, IAuthenticator
 from repoze.who.interfaces import IMetadataProvider
 
+
 class INIMetadataProvider(object):
 
     implements(IMetadataProvider)
@@ -16,9 +17,9 @@ def __init__(self, ini_file, key_attribute):
         self.key_attribute = key_attribute
 
     def add_metadata(self, _environ, identity):
-        #logger = environ.get('repoze.who.logger','')
+        # logger = environ.get('repoze.who.logger','')
 
-        key = identity.get('repoze.who.userid')
+        key = identity.get("repoze.who.userid")
         try:
             if self.key_attribute:
                 for sec in self.users.sections():
@@ -31,5 +32,6 @@ def add_metadata(self, _environ, identity):
         except ValueError:
             pass
 
+
 def make_plugin(ini_file, key_attribute=""):
     return INIMetadataProvider(ini_file, key_attribute)