From f3613e761444a676c4e31f213e8274a1c2a4c088 Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Fri, 24 Jan 2014 17:49:23 +0100 Subject: Remove some pylint errors and warnings --- ipsilon/login/authkrb.py | 6 ++++++ ipsilon/login/authpam.py | 1 + ipsilon/login/common.py | 2 +- ipsilon/util/data.py | 2 +- ipsilon/util/page.py | 1 + ipsilon/util/plugin.py | 4 ++-- 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ipsilon/login/authkrb.py b/ipsilon/login/authkrb.py index 2ad258a..09790ed 100755 --- a/ipsilon/login/authkrb.py +++ b/ipsilon/login/authkrb.py @@ -22,6 +22,11 @@ import cherrypy class Krb(common.LoginPageBase): + def __init__(self, *args, **kwargs): + super(Krb, self).__init__(*args, **kwargs) + self.negotiate = None + self.unauthorized = None + def root(self, *args, **kwargs): # Someone typed manually or a robot is walking th tree. # Redirect to default page @@ -69,6 +74,7 @@ class LoginManager(common.LoginManagerBase): self.description = """ Kereros Negotiate authentication plugin. Relies on the mod_auth_kerb apache plugin for actual authentication. """ + self.page = None def get_tree(self, site): self.page = Krb(site, self) diff --git a/ipsilon/login/authpam.py b/ipsilon/login/authpam.py index 223c158..4d9d0bf 100755 --- a/ipsilon/login/authpam.py +++ b/ipsilon/login/authpam.py @@ -93,6 +93,7 @@ for authentication. """ 'Password' ], } + self.page = None @property def service_name(self): diff --git a/ipsilon/login/common.py b/ipsilon/login/common.py index dbeec0f..cb64fcf 100755 --- a/ipsilon/login/common.py +++ b/ipsilon/login/common.py @@ -119,7 +119,7 @@ class Login(page.Page): login_plugins['config'] = config plugins = Plugins(path=cherrypy.config['base.dir']) - (login_path, login_file) = os.path.split(inspect.getfile(Login)) + (login_path, dummy_file) = os.path.split(inspect.getfile(Login)) login_plugins['available'] = plugins.get_plugins(login_path, 'LoginManager') login_plugins['enabled'] = [] diff --git a/ipsilon/util/data.py b/ipsilon/util/data.py index 3fda6d3..0edbe80 100755 --- a/ipsilon/util/data.py +++ b/ipsilon/util/data.py @@ -160,7 +160,7 @@ class Store(object): else: conf[row[1]] = row[2] - return (lpo, plco); + return (lpo, plco) def get_login_config(self): return self._load_login_config(self._admin_dbname) diff --git a/ipsilon/util/page.py b/ipsilon/util/page.py index 0a21ed4..5c843af 100755 --- a/ipsilon/util/page.py +++ b/ipsilon/util/page.py @@ -33,6 +33,7 @@ class Page(object): self.user = None def __call__(self, *args, **kwargs): + # pylint: disable=star-args self.user = user.UserSession().get_user() if len(args) > 0: diff --git a/ipsilon/util/plugin.py b/ipsilon/util/plugin.py index 0c8e466..017be2a 100755 --- a/ipsilon/util/plugin.py +++ b/ipsilon/util/plugin.py @@ -41,7 +41,7 @@ class Plugins(object): # 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 @@ -55,7 +55,7 @@ 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 -- cgit