Fix pep8 errors

10 files changed, 25 insertions, 14 deletions

diff --git a/ipsilon/admin/common.py b/ipsilon/admin/common.py
index fc4a0a1..98ea4a5 100755
--- a/ipsilon/admin/common.py
+++ b/ipsilon/admin/common.py
@@ -23,6 +23,7 @@ from ipsilon.util.user import UserSession
 import cherrypy
 import sqlite3
 
+
 def admin_protect(fn):
 
     def check(*args, **kwargs):
@@ -33,6 +34,7 @@ def admin_protect(fn):
 
     return check
 
+
 class LoginPluginPage(Page):
 
     def __init__(self, obj, site, baseurl):
@@ -67,7 +69,7 @@ class LoginPluginPage(Page):
             if key in self.plugin_config:
                 if value != self.plugin_config[key][2]:
                     cherrypy.log.error("Storing [%s]: %s = %s" % (
-                                            self._obj.name, key, value))
+                                       self._obj.name, key, value))
                     new_values[key] = value
 
         if len(new_values) != 0:
@@ -119,6 +121,5 @@ class Admin(Page):
     def root(self, *args, **kwargs):
         login_plugins = self._site['login_plugins']
         return self._template('admin/index.html', title='Administration',
-                              available = login_plugins['available'],
-                              enabled = login_plugins['enabled'])
-
+                              available=login_plugins['available'],
+                              enabled=login_plugins['enabled'])
diff --git a/ipsilon/login/authkrb.py b/ipsilon/login/authkrb.py
index 09790ed..8747f22 100755
--- a/ipsilon/login/authkrb.py
+++ b/ipsilon/login/authkrb.py
@@ -20,6 +20,7 @@
 from ipsilon.login import common
 import cherrypy
 
+
 class Krb(common.LoginPageBase):
 
     def __init__(self, *args, **kwargs):
@@ -65,6 +66,7 @@ class KrbError(common.LoginPageBase):
         # If we get here, negotiate failed
         return self.lm.auth_failed()
 
+
 class LoginManager(common.LoginManagerBase):
 
     def __init__(self, *args, **kwargs):
diff --git a/ipsilon/login/authpam.py b/ipsilon/login/authpam.py
index 4d9d0bf..2ce8bab 100755
--- a/ipsilon/login/authpam.py
+++ b/ipsilon/login/authpam.py
@@ -21,6 +21,7 @@ from ipsilon.login import common
 import cherrypy
 import pam
 
+
 class Pam(common.LoginPageBase):
 
     def _authenticate(self, username, password):
@@ -67,6 +68,7 @@ class Pam(common.LoginPageBase):
         if callable(op):
             return op(*args, **kwargs)
 
+
 class LoginManager(common.LoginManagerBase):
 
     def __init__(self, *args, **kwargs):
diff --git a/ipsilon/login/common.py b/ipsilon/login/common.py
index cb64fcf..87bcf37 100755
--- a/ipsilon/login/common.py
+++ b/ipsilon/login/common.py
@@ -26,6 +26,7 @@ import cherrypy
 import inspect
 import os
 
+
 class LoginManagerBase(object):
 
     def __init__(self):
@@ -140,7 +141,6 @@ class Login(page.Page):
                 obj.set_config(config[item])
             self.__dict__[item] = obj.get_tree(self._site)
 
-
     def _log(self, fact):
         if cherrypy.config.get('debug', False):
             cherrypy.log(fact)
diff --git a/ipsilon/main.py b/ipsilon/main.py
index dd8fd12..0e84495 100755
--- a/ipsilon/main.py
+++ b/ipsilon/main.py
@@ -41,10 +41,9 @@ templates = os.path.join(cherrypy.config['base.dir'], 'templates')
 template_env = Environment(loader=FileSystemLoader(templates))
 
 if __name__ == "__main__":
-    conf = { '/': {'tools.staticdir.root': os.getcwd()},
-             '/ui': { 'tools.staticdir.on': True,
-                      'tools.staticdir.dir': 'ui' }
-           }
+    conf = {'/': {'tools.staticdir.root': os.getcwd()},
+            '/ui': {'tools.staticdir.on': True,
+                    'tools.staticdir.dir': 'ui'}}
     cherrypy.quickstart(Root('default', template_env), '/', conf)
 
 else:
diff --git a/ipsilon/root.py b/ipsilon/root.py
index ebf01d4..664085b 100755
--- a/ipsilon/root.py
+++ b/ipsilon/root.py
@@ -23,6 +23,7 @@ import ipsilon.admin.common as ac
 
 sites = dict()
 
+
 class Root(Page):
 
     def __init__(self, site, template_env):
diff --git a/ipsilon/util/data.py b/ipsilon/util/data.py
index 8633b42..b6cd0d6 100755
--- a/ipsilon/util/data.py
+++ b/ipsilon/util/data.py
@@ -21,6 +21,7 @@ import os
 import sqlite3
 import cherrypy
 
+
 class Store(object):
 
     def __init__(self, path=None):
@@ -103,7 +104,7 @@ class Store(object):
             if con:
                 con.rollback()
             cherrypy.log.error("Failed to load %s's prefs from "
-                               "%s: [%s]" % ( user, dbname, e))
+                               "%s: [%s]" % (user, dbname, e))
         finally:
             if con:
                 con.close()
diff --git a/ipsilon/util/page.py b/ipsilon/util/page.py
index 5c843af..d8ce09c 100755
--- a/ipsilon/util/page.py
+++ b/ipsilon/util/page.py
@@ -20,9 +20,11 @@
 from ipsilon.util import user
 import cherrypy
 
+
 def protect():
     user.UserSession().remote_login()
 
+
 class Page(object):
     def __init__(self, site):
         if not 'template_env' in site:
@@ -38,7 +40,7 @@ class Page(object):
 
         if len(args) > 0:
             op = getattr(self, args[0], None)
-            if callable(op) and getattr(self, args[0]+'.exposed', None):
+            if callable(op) and getattr(self, args[0] + '.exposed', None):
                 return op(*args[1:], **kwargs)
         else:
             op = getattr(self, 'root', None)
diff --git a/ipsilon/util/plugin.py b/ipsilon/util/plugin.py
index 017be2a..60ea922 100755
--- a/ipsilon/util/plugin.py
+++ b/ipsilon/util/plugin.py
@@ -21,6 +21,7 @@ import os
 import imp
 import cherrypy
 
+
 class Plugins(object):
 
     def __init__(self, path=None):
@@ -41,7 +42,7 @@ class Plugins(object):
             #    mod = imp.load_compiled(name, file_name)
             else:
                 return
-        except Exception, e: # pylint: disable=broad-except
+        except Exception, e:  # pylint: disable=broad-except
             cherrypy.log.error('Failed to load "%s" module: [%s]' % (name, e))
             return
 
@@ -55,7 +56,7 @@ class Plugins(object):
         files = None
         try:
             files = os.listdir(path)
-        except Exception, e: # pylint: disable=broad-except
+        except Exception, e:  # pylint: disable=broad-except
             cherrypy.log.error('No modules in %s: [%s]' % (path, e))
             return
 
diff --git a/ipsilon/util/user.py b/ipsilon/util/user.py
index 11ce594..7a1504a 100755
--- a/ipsilon/util/user.py
+++ b/ipsilon/util/user.py
@@ -20,12 +20,14 @@
 from ipsilon.util import data
 import cherrypy
 
+
 class Site(object):
     def __init__(self, value):
         # implement lookup of sites id for link/name
         self.link = value
         self.name = value
 
+
 class User(object):
     def __init__(self, username):
         if username is None:
@@ -110,7 +112,7 @@ class UserSession(object):
             if not type(user) is User:
                 raise TypeError
             # Completely reset user data
-            cherrypy.log.error('%s %s' % (user.name , user.fullname))
+            cherrypy.log.error('%s %s' % (user.name, user.fullname))
             user.reset()
 
         # Destroy current session in all cases