Code cleanliness - appease pychecker.

5 files changed, 12 insertions, 21 deletions

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):
diff --git a/libmproxy/flow.py b/libmproxy/flow.py
index e649fbb8..89a91e68 100644
--- a/libmproxy/flow.py
+++ b/libmproxy/flow.py
@@ -2,7 +2,7 @@
     This module provides more sophisticated flow tracking. These match requests
     with their responses, and provide filtering and interception facilities.
 """
-import subprocess, sys, json, hashlib, Cookie, cookielib, base64, copy, re
+import json, hashlib, Cookie, cookielib, base64, copy, re
 import time
 import netstring, filt, script, utils, encoding, proxy
 from email.utils import parsedate_tz, formatdate, mktime_tz
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py
index e95b38e2..0ef5e225 100644
--- a/libmproxy/proxy.py
+++ b/libmproxy/proxy.py
@@ -5,10 +5,10 @@
 
     Development started from Neil Schemenauer's munchy.py
 """
-import sys, os, string, socket, select, time, Cookie
+import sys, os, string, socket, select, time
 import shutil, tempfile, threading
 import optparse, SocketServer, ssl
-import utils, controller, flow
+import utils, flow
 
 NAME = "mitmproxy"
 
diff --git a/libmproxy/script.py b/libmproxy/script.py
index 251d6dea..bec07343 100644
--- a/libmproxy/script.py
+++ b/libmproxy/script.py
@@ -1,4 +1,4 @@
-import imp, os, traceback, flow
+import os, traceback
 
 class ScriptError(Exception):
     pass
@@ -14,7 +14,6 @@ class Script:
     """
     def __init__(self, path, ctx):
         self.path, self.ctx = path, ctx
-        self.mod = None
         self.ns = None
 
     def load(self):
@@ -31,7 +30,7 @@ class Script:
             raise ScriptError("Not a file: %s"%self.path)
         ns = {}
         try:
-            self.mod = execfile(path, ns, ns)
+            execfile(path, ns, ns)
         except Exception, v:
             raise ScriptError(traceback.format_exc(v))
         self.ns = ns
diff --git a/libmproxy/utils.py b/libmproxy/utils.py
index c9a8fd29..1c34b2fb 100644
--- a/libmproxy/utils.py
+++ b/libmproxy/utils.py
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import re, os, subprocess, datetime, urlparse, string
-import time, functools, copy, cgi, textwrap
+import time, functools, cgi, textwrap
 import json
 
 CERT_SLEEP_TIME = 1