From 3e32715a5516770a779de22e339622fca9bcee3d Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Fri, 6 Jun 2014 20:37:48 +0530
Subject: [PATCH] Don't take unnecessary kwargs in exposed methods

---
 modules/firewall/firewall.py |  4 +---
 modules/packages/packages.py |  4 +---
 modules/pagekite/pagekite.py |  4 +---
 modules/xmpp/xmpp.py         | 12 ++----------
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/modules/firewall/firewall.py b/modules/firewall/firewall.py
index 6d5214fde..aa581d886 100644
--- a/modules/firewall/firewall.py
+++ b/modules/firewall/firewall.py
@@ -45,10 +45,8 @@ class Firewall(PagePlugin):
 
     @cherrypy.expose
     @require()
-    def index(self, **kwargs):
+    def index(self):
         """Serve introcution page"""
-        del kwargs  # Unused
-
         if not self.get_installed_status():
             return util.render_template(template='firewall',
                                         title=_("Firewall"),
diff --git a/modules/packages/packages.py b/modules/packages/packages.py
index d6f589238..9bd32cfe1 100644
--- a/modules/packages/packages.py
+++ b/modules/packages/packages.py
@@ -58,10 +58,8 @@ class Packages(PagePlugin):
 
     @cherrypy.expose
     @require()
-    def index(self, *args, **kwargs):
+    def index(self, **kwargs):
         """Serve the form"""
-        del args  # Unused
-
         status = self.get_status()
 
         form = None
diff --git a/modules/pagekite/pagekite.py b/modules/pagekite/pagekite.py
index 57037708e..29de188ad 100644
--- a/modules/pagekite/pagekite.py
+++ b/modules/pagekite/pagekite.py
@@ -46,10 +46,8 @@ class PageKite(PagePlugin):
     @staticmethod
     @cherrypy.expose
     @require()
-    def index(**kwargs):
+    def index():
         """Serve introdution page"""
-        del kwargs  # Unused
-
         menu = {'title': _('PageKite'),
                 'items': [{'url': '/apps/pagekite/configure',
                            'text': _('Configure PageKite')}]}
diff --git a/modules/xmpp/xmpp.py b/modules/xmpp/xmpp.py
index ff9d354fb..4da0e3427 100644
--- a/modules/xmpp/xmpp.py
+++ b/modules/xmpp/xmpp.py
@@ -40,9 +40,8 @@ class XMPP(PagePlugin):
     @staticmethod
     @cherrypy.expose
     @require()
-    def index(**kwargs):
+    def index():
         """Serve XMPP page"""
-        del kwargs  # Unused
         main = "<p>XMPP Server Accounts and Configuration</p>"
 
         sidebar_right = util.render_template(template='menu_block',
@@ -107,13 +106,6 @@ class Configure(PagePlugin):
 
         return {'inband_enabled': 'inband_enable' in output.split()}
 
-    @staticmethod
-    def sidebar_right(**kwargs):
-        """Return rendered string for sidebar on the right"""
-        del kwargs  # Unused
-
-        return util.render_template(template='menu_block', menu=SIDE_MENU)
-
     @staticmethod
     def _apply_changes(old_status, new_status, messages):
         """Apply the form changes"""
@@ -133,7 +125,7 @@ class Configure(PagePlugin):
         cfg.log.info('Option - %s' % option)
 
         _output, error = actions.superuser_run('xmpp-setup', [option])
-        del _output
+        del _output  # Unused
         if error:
             raise Exception('Error running command - %s' % error)