pylint 1.4.3 version fixes

[cascardo/ipsilon.git] / ipsilon / admin / common.py

diff --git a/ipsilon/admin/common.py b/ipsilon/admin/common.py
index a85a15d..64334c2 100644 (file)
--- a/ipsilon/admin/common.py
+++ b/ipsilon/admin/common.py
@@ -16,6 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import cherrypy
+import logging
 from ipsilon.util.page import Page
 from ipsilon.util.page import admin_protect
 from ipsilon.util.endpoint import allow_iframe
@@ -96,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:
@@ -113,7 +114,8 @@ class AdminPluginConfig(AdminPage):
 
             if value != option.get_value():
                 cherrypy.log.error("Storing [%s]: %s = %s" %
-                                   (self._po.name, name, value))
+                                   (self._po.name, name, value),
+                                   severity=logging.DEBUG)
             option.set_value(value)
             new_db_values[name] = option.export_value()
 
@@ -222,7 +224,8 @@ class AdminPlugins(AdminPage):
             return
 
         for plugin in self._site[facility].available:
-            cherrypy.log.error('Admin info plugin: %s' % plugin)
+            cherrypy.log.error('Admin info plugin: %s' % plugin,
+                               severity=logging.DEBUG)
             obj = self._site[facility].available[plugin]
             page = AdminPluginConfig(obj, self._site, self)
             if hasattr(obj, 'admin'):
@@ -254,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):
@@ -348,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