From b51aac8a865984b65a84c0da3cb155cb3fbb6875 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Thu, 4 Aug 2011 10:34:34 +1200
Subject: Code cleanliness - appease pychecker.

---
 libmproxy/console.py | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'libmproxy/console.py')

diff --git a/libmproxy/console.py b/libmproxy/console.py
index c798cf43..a16837a3 100644
--- a/libmproxy/console.py
+++ b/libmproxy/console.py
@@ -864,8 +864,6 @@ class Options(object):
         "limit",
         "no_server",
         "refresh_server_playback",
-        "request_script",
-        "response_script",
         "rfile",
         "script",
         "rheaders",
@@ -952,11 +950,6 @@ class ConsoleMaster(flow.FlowMaster):
         self.conn_list_view = None
         self.set_palette()
 
-        if options.response_script:
-            self.set_response_script(options.response_script)
-        if options.request_script:
-            self.set_request_script(options.request_script)
-
         r = self.set_limit(options.limit)
         if r:
             print >> sys.stderr, "Limit error:", r
@@ -1085,15 +1078,14 @@ class ConsoleMaster(flow.FlowMaster):
         return txt
 
     def _view_conn_urlencoded(self, lines):
+        kv = format_keyvals(
+                [(k+":", v) for (k, v) in lines],
+                key = "header",
+                val = "text"
+             )
         return [
                     urwid.Text(("highlight", "URLencoded data:\n")),
-                    urwid.Text(
-                        format_keyvals(
-                            [(k+":", v) for (k, v) in lines],
-                            key = "header",
-                            val = "text"
-                        )
-                    )
+                    urwid.Text(kv)
                 ]
 
     def _find_pretty_view(self, content, hdrItems):
-- 
cgit v1.2.3