diff options
Diffstat (limited to 'ipsilon/util')
| -rwxr-xr-x | ipsilon/util/data.py | 3 | ||||
| -rwxr-xr-x | ipsilon/util/page.py | 2 | ||||
| -rwxr-xr-x | ipsilon/util/plugin.py | 1 | ||||
| -rwxr-xr-x | ipsilon/util/user.py | 3 |
4 files changed, 7 insertions, 2 deletions
diff --git a/ipsilon/util/data.py b/ipsilon/util/data.py index 858fa55..15bf5b7 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): @@ -91,7 +92,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 a7e2035..18b5be2 100755 --- a/ipsilon/util/page.py +++ b/ipsilon/util/page.py @@ -20,6 +20,7 @@ from ipsilon.util.user import User import cherrypy + def protect(): if cherrypy.request.login: user = cherrypy.session.get('user', None) @@ -29,6 +30,7 @@ def protect(): cherrypy.session.regenerate() cherrypy.session['user'] = cherrypy.request.login + class Page(object): def __init__(self, template_env): self._env = template_env diff --git a/ipsilon/util/plugin.py b/ipsilon/util/plugin.py index 2db88dd..917f28b 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): diff --git a/ipsilon/util/user.py b/ipsilon/util/user.py index 6c5fc51..ccca9fb 100755 --- a/ipsilon/util/user.py +++ b/ipsilon/util/user.py @@ -19,12 +19,14 @@ from ipsilon.util.data import Store + 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: @@ -76,4 +78,3 @@ class User(object): def sites(self): #TODO: implement setting sites via the user object ? raise AttributeError - |