summaryrefslogtreecommitdiffstats
path: root/ipsilon/admin/common.py
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2015-05-07 12:33:40 -0400
committerSimo Sorce <simo@redhat.com>2015-05-07 14:29:49 -0400
commitd8aa3e10398d0d23eefdbda899475ca32ec3abf6 (patch)
treef17e5fb0f9f0a1a922bcbd80ec798396c508f56d /ipsilon/admin/common.py
parent93d4e52712767fe955f3a44a60a6c6f0f909423b (diff)
downloadipsilon-d8aa3e10398d0d23eefdbda899475ca32ec3abf6.tar.gz
ipsilon-d8aa3e10398d0d23eefdbda899475ca32ec3abf6.tar.xz
ipsilon-d8aa3e10398d0d23eefdbda899475ca32ec3abf6.zip
pylint 1.4.3 version fixespylint143
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 <simo@redhat.com>
Diffstat (limited to 'ipsilon/admin/common.py')
-rw-r--r--ipsilon/admin/common.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/ipsilon/admin/common.py b/ipsilon/admin/common.py
index 87bfcd5..64334c2 100644
--- a/ipsilon/admin/common.py
+++ b/ipsilon/admin/common.py
@@ -97,14 +97,14 @@ class AdminPluginConfig(AdminPage):
aname = '%s_%s' % (name, a)
if aname in kwargs:
value.append(a)
- elif type(option) is pconfig.ComplexList:
- value = get_complex_list_value(name,
+ elif isinstance(option, pconfig.MappingList):
+ value = get_mapping_list_value(name,
option.get_value(),
**kwargs)
if value is None:
continue
- elif type(option) is pconfig.MappingList:
- value = get_mapping_list_value(name,
+ elif isinstance(option, pconfig.ComplexList):
+ value = get_complex_list_value(name,
option.get_value(),
**kwargs)
if value is None:
@@ -257,7 +257,6 @@ class AdminPlugins(AdminPage):
targs['order_name'] = '%s_order_form' % self.name
targs['order_action'] = self.order.url
- # pylint: disable=star-args
return self._template(self.template, **targs)
def root(self, *args, **kwargs):
@@ -351,7 +350,6 @@ class Admin(AdminPage):
def scheme(self):
cherrypy.response.headers.update({'Content-Type': 'image/svg+xml'})
urls = self.get_menu_urls()
- # pylint: disable=star-args
return str(self._template('admin/ipsilon-scheme.svg', **urls))
scheme.public_function = True