summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2014-01-23 18:11:26 +0100
committerSimo Sorce <simo@redhat.com>2014-01-24 17:32:21 -0500
commite34f21377d30704c342abb24a3a84c27fd8cc957 (patch)
tree9f2f5e15a33190ce6a90df58cd63c379c3983b7b
parentfe98579005973824000edb91e55975f2e7bf39e1 (diff)
downloadipsilon-e34f21377d30704c342abb24a3a84c27fd8cc957.tar.gz
ipsilon-e34f21377d30704c342abb24a3a84c27fd8cc957.tar.xz
ipsilon-e34f21377d30704c342abb24a3a84c27fd8cc957.zip
Use pep8 check
Signed-off-by: Petr Vobornik <pvoborni@redhat.com> Signed-off-by: Simo Sorce <simo@redhat.com>
-rw-r--r--Makefile6
-rwxr-xr-xipsilon/idpserver.py7
-rwxr-xr-xipsilon/root.py1
-rwxr-xr-xipsilon/util/data.py3
-rwxr-xr-xipsilon/util/page.py2
-rwxr-xr-xipsilon/util/plugin.py1
-rwxr-xr-xipsilon/util/user.py3
7 files changed, 16 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 7d81f00..edd68f0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: lint
+all: lint pep8
lint:
# Analyze code
@@ -9,3 +9,7 @@ lint:
--notes= \
--ignored-classes=cherrypy \
./ipsilon
+
+pep8:
+ # Check style consistency
+ pep8 ipsilon
diff --git a/ipsilon/idpserver.py b/ipsilon/idpserver.py
index a10f175..e260043 100755
--- a/ipsilon/idpserver.py
+++ b/ipsilon/idpserver.py
@@ -47,10 +47,9 @@ env = Environment(loader=FileSystemLoader(templates))
cherrypy.tools.protect = cherrypy.Tool('before_handler', page.protect)
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(env), '/', conf)
else:
diff --git a/ipsilon/root.py b/ipsilon/root.py
index cd64ef3..e445dc5 100755
--- a/ipsilon/root.py
+++ b/ipsilon/root.py
@@ -19,6 +19,7 @@
from ipsilon.util.page import Page
+
class Root(Page):
def root(self):
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
-