diff options
| author | Petr Vobornik <pvoborni@redhat.com> | 2014-01-24 17:38:23 +0100 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2014-01-24 19:34:07 +0100 |
| commit | 489c7243f5312da352a4b15ad0cce4e4fcce0205 (patch) | |
| tree | e27176d18623f7c1048b1b0a539cfd713db0a68f /ipsilon/util | |
| parent | af55c409b9182f9ef13dd6bdc91f68956a4060aa (diff) | |
| download | ipsilon-489c7243f5312da352a4b15ad0cce4e4fcce0205.tar.gz ipsilon-489c7243f5312da352a4b15ad0cce4e4fcce0205.tar.xz ipsilon-489c7243f5312da352a4b15ad0cce4e4fcce0205.zip | |
Fix pep8 errors
Diffstat (limited to 'ipsilon/util')
| -rwxr-xr-x | ipsilon/util/data.py | 3 | ||||
| -rwxr-xr-x | ipsilon/util/page.py | 4 | ||||
| -rwxr-xr-x | ipsilon/util/plugin.py | 5 | ||||
| -rwxr-xr-x | ipsilon/util/user.py | 4 |
4 files changed, 11 insertions, 5 deletions
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 |
