Minor cruft removal.

libmproxy/certutils.py

@@ -2,7 +2,6 @@ import os, ssl, hashlib, socket, time, datetime
 from pyasn1.type import univ, constraint, char, namedtype, tag
 from pyasn1.codec.der.decoder import decode
 import OpenSSL
-import utils
 
 CERT_SLEEP_TIME = 1
 CERT_EXPIRY = str(365 * 3)
@@ -98,7 +97,6 @@ def dummy_cert(certdir, ca, commonname, sans):
     else:
         key, ca = create_ca()
 
-    pkey = ca.get_pubkey()
     req = OpenSSL.crypto.X509Req()
     subj = req.get_subject()
     subj.CN = commonname

libmproxy/cmdline.py

@@ -14,7 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import proxy
-import optparse, re, filt, textwrap
+import optparse, re, filt
 
 
 class ParseReplaceException(Exception): pass

libmproxy/console/contentview.py

@@ -127,7 +127,7 @@ def view_xml(hdrs, content, limit):
     parser = lxml.etree.XMLParser(remove_blank_text=True, resolve_entities=False, strip_cdata=False, recover=False)
     try:
         document = lxml.etree.fromstring(content, parser)
-    except lxml.etree.XMLSyntaxError, v:
+    except lxml.etree.XMLSyntaxError:
         return None
     docinfo = document.getroottree().docinfo
 

libmproxy/console/flowdetailview.py

@@ -15,7 +15,6 @@
 
 import urwid
 import common
-from .. import filt, version
 
 footer = [
     ('heading_key', "q"), ":back ",

libmproxy/console/flowview.py

@@ -13,10 +13,10 @@
 # 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 os, re, sys
+import os, sys
 import urwid
 import common, grideditor, contentview
-from .. import utils, encoding, flow
+from .. import utils, flow
 
 def _mkhelp():
     text = []

libmproxy/filt.py

@@ -40,7 +40,6 @@
 """
 import re, sys
 import contrib.pyparsing as pp
-import flow
 
 
 class _Token:

libmproxy/utils.py

@@ -12,8 +12,8 @@
 #
 # 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, datetime, urlparse, string, urllib
-import time, functools, cgi, textwrap
+import os, datetime, urlparse, string, urllib
+import time, functools, cgi
 import json
 
 def timestamp():