From d8aa3e10398d0d23eefdbda899475ca32ec3abf6 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Thu, 7 May 2015 12:33:40 -0400 Subject: pylint 1.4.3 version fixes Pylint 1.4.3 completely stopped recognizing the star-args condition. In order to avoid pylint error with > 1.4.3 stop caring for star-args and add cmdline option to ignore those errors completly so older pylint versions are happy too. Also fix type() vs isinstance() checks, isinstance is generally a more correct approach to check for calsses. In some 'admin' files the type() -> isinstance() fix required to invert the order in which ComplexList and MappingList are checked as the latter is a subclass of ComplexList, so it needs to be checked first otherwise the check for isinstance(option, ComplexList) matches for both and the code stops funciotning properly. Signed-off-by: Simo Sorce --- ipsilon/login/authfas.py | 1 - ipsilon/login/authform.py | 2 +- ipsilon/login/authgssapi.py | 2 +- ipsilon/login/authldap.py | 1 - ipsilon/login/authpam.py | 1 - ipsilon/login/authtest.py | 1 - ipsilon/login/common.py | 1 - 7 files changed, 2 insertions(+), 7 deletions(-) (limited to 'ipsilon/login') diff --git a/ipsilon/login/authfas.py b/ipsilon/login/authfas.py index 1489f73..996855c 100644 --- a/ipsilon/login/authfas.py +++ b/ipsilon/login/authfas.py @@ -80,7 +80,6 @@ class FAS(LoginFormBase): error_username=not username ) self.lm.set_auth_error() - # pylint: disable=star-args return self._template(self.formtemplate, **context) def make_userdata(self, fas_data): diff --git a/ipsilon/login/authform.py b/ipsilon/login/authform.py index ecce919..0e20a60 100644 --- a/ipsilon/login/authform.py +++ b/ipsilon/login/authform.py @@ -123,7 +123,7 @@ class Installer(LoginManagerInstaller): 'service': opts['form_service']} tmpl = Template(CONF_TEMPLATE) - hunk = tmpl.substitute(**confopts) # pylint: disable=star-args + hunk = tmpl.substitute(**confopts) with open(opts['httpd_conf'], 'a') as httpd_conf: httpd_conf.write(hunk) diff --git a/ipsilon/login/authgssapi.py b/ipsilon/login/authgssapi.py index 3ef7616..1fac5ed 100644 --- a/ipsilon/login/authgssapi.py +++ b/ipsilon/login/authgssapi.py @@ -147,7 +147,7 @@ class Installer(LoginManagerInstaller): confopts['gssapisslonly'] = 'On' tmpl = Template(CONF_TEMPLATE) - hunk = tmpl.substitute(**confopts) # pylint: disable=star-args + hunk = tmpl.substitute(**confopts) with open(opts['httpd_conf'], 'a') as httpd_conf: httpd_conf.write(hunk) diff --git a/ipsilon/login/authldap.py b/ipsilon/login/authldap.py index 595d6be..2882897 100644 --- a/ipsilon/login/authldap.py +++ b/ipsilon/login/authldap.py @@ -86,7 +86,6 @@ class LDAP(LoginFormBase, Log): error_username=not username ) self.lm.set_auth_error() - # pylint: disable=star-args return self._template('login/form.html', **context) diff --git a/ipsilon/login/authpam.py b/ipsilon/login/authpam.py index ba8ecdd..d703aa2 100644 --- a/ipsilon/login/authpam.py +++ b/ipsilon/login/authpam.py @@ -62,7 +62,6 @@ class Pam(LoginFormBase): error_username=not username ) self.lm.set_auth_error() - # pylint: disable=star-args return self._template('login/form.html', **context) diff --git a/ipsilon/login/authtest.py b/ipsilon/login/authtest.py index 7769650..002ab73 100644 --- a/ipsilon/login/authtest.py +++ b/ipsilon/login/authtest.py @@ -56,7 +56,6 @@ class TestAuth(LoginFormBase): error_username=not username ) self.lm.set_auth_error() - # pylint: disable=star-args return self._template('login/form.html', **context) diff --git a/ipsilon/login/common.py b/ipsilon/login/common.py index 6e21635..c7c8050 100644 --- a/ipsilon/login/common.py +++ b/ipsilon/login/common.py @@ -185,7 +185,6 @@ class LoginFormBase(LoginPageBase): def GET(self, *args, **kwargs): context = self.create_tmpl_context() - # pylint: disable=star-args return self._template(self.formtemplate, **context) def root(self, *args, **kwargs): -- cgit