summaryrefslogtreecommitdiffstats
path: root/ipsilon
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2014-01-23 15:51:20 +0100
committerSimo Sorce <simo@redhat.com>2014-01-24 17:32:18 -0500
commitfe98579005973824000edb91e55975f2e7bf39e1 (patch)
tree92534c4405c8be483dbd3772be299323d6298c63 /ipsilon
parent47ff1fb4cd7a6c416c93246decacd19628b232c3 (diff)
downloadipsilon-fe98579005973824000edb91e55975f2e7bf39e1.tar.gz
ipsilon-fe98579005973824000edb91e55975f2e7bf39e1.tar.xz
ipsilon-fe98579005973824000edb91e55975f2e7bf39e1.zip
Use pylint check
Signed-off-by: Petr Vobornik <pvoborni@redhat.com> Reviewed-by: Simo Sorce <simo@redhat.com>
Diffstat (limited to 'ipsilon')
-rwxr-xr-xipsilon/util/data.py2
-rwxr-xr-xipsilon/util/page.py2
-rwxr-xr-xipsilon/util/plugin.py12
-rwxr-xr-xipsilon/util/user.py2
4 files changed, 10 insertions, 8 deletions
diff --git a/ipsilon/util/data.py b/ipsilon/util/data.py
index ec64588..858fa55 100755
--- a/ipsilon/util/data.py
+++ b/ipsilon/util/data.py
@@ -102,7 +102,7 @@ class Store(object):
return conf
- def _get_user_preferences(self, user):
+ def get_user_preferences(self, user):
path = None
if 'user.prefs.db' in cherrypy.config:
path = cherrypy.config['user.prefs.db']
diff --git a/ipsilon/util/page.py b/ipsilon/util/page.py
index a99ece8..a7e2035 100755
--- a/ipsilon/util/page.py
+++ b/ipsilon/util/page.py
@@ -34,8 +34,10 @@ class Page(object):
self._env = template_env
self.basepath = cherrypy.config.get('base.mount', "")
self.username = None
+ self.user = None
def __call__(self, *args, **kwargs):
+ # pylint: disable=star-args
self.username = cherrypy.session.get('user', None)
self.user = User(self.username)
diff --git a/ipsilon/util/plugin.py b/ipsilon/util/plugin.py
index be9ed02..2db88dd 100755
--- a/ipsilon/util/plugin.py
+++ b/ipsilon/util/plugin.py
@@ -37,11 +37,11 @@ class Plugins(object):
try:
if ext.lower() == '.py':
mod = imp.load_source(name, file_name)
- elif ex.lower() == '.pyc':
+ elif ext.lower() == '.pyc':
mod = imp.load_compiled(name, file_name)
else:
return
- except Exception, e:
+ except Exception, e: # pylint: disable=broad-except
cherrypy.log.error('Failed to load "%s" module: [%s]' % (name, e))
return
@@ -53,12 +53,12 @@ class Plugins(object):
files = None
try:
files = os.listdir(path)
- except Exception, e:
+ except Exception, e: # pylint: disable=broad-except
cherrypy.log.error('No modules in %s: [%s]' % (path, e))
return
for name in files:
- filename = od.path.join(path, name)
+ filename = os.path.join(path, name)
self._load_class(tree, class_type, filename)
def get_providers(self):
@@ -74,7 +74,7 @@ class Plugins(object):
return self._providers_tree
- def get_custom(self, class_type):
+ def get_custom(self, path, class_type):
tree = []
- self._load_classes(tree, class_type)
+ self._load_classes(tree, path, class_type)
return tree
diff --git a/ipsilon/util/user.py b/ipsilon/util/user.py
index 3b58724..6c5fc51 100755
--- a/ipsilon/util/user.py
+++ b/ipsilon/util/user.py
@@ -36,7 +36,7 @@ class User(object):
def _get_user_data(self, username):
store = Store()
- return store._get_user_preferences(username)
+ return store.get_user_preferences(username)
@property
def is_admin(self):