diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-04-09 11:42:56 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-04-09 11:42:56 +1200 |
| commit | 24a8dc408caa392cc846cf01a9b7e74a2018107e (patch) | |
| tree | 6b28981d23ab590ddebd84dbf44339e39d35082d /libmproxy | |
| parent | d7748cea4f209d45af99e5ac03438faa3184bc64 (diff) | |
| download | mitmproxy-24a8dc408caa392cc846cf01a9b7e74a2018107e.tar.gz mitmproxy-24a8dc408caa392cc846cf01a9b7e74a2018107e.tar.bz2 mitmproxy-24a8dc408caa392cc846cf01a9b7e74a2018107e.zip | |
Minor cruft removal.
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/certutils.py | 2 | ||||
| -rw-r--r-- | libmproxy/cmdline.py | 2 | ||||
| -rw-r--r-- | libmproxy/console/contentview.py | 2 | ||||
| -rw-r--r-- | libmproxy/console/flowdetailview.py | 1 | ||||
| -rw-r--r-- | libmproxy/console/flowview.py | 4 | ||||
| -rw-r--r-- | libmproxy/filt.py | 1 | ||||
| -rw-r--r-- | libmproxy/utils.py | 4 |
7 files changed, 6 insertions, 10 deletions
diff --git a/libmproxy/certutils.py b/libmproxy/certutils.py index 354db5ad..d52d9a56 100644 --- a/libmproxy/certutils.py +++ b/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 diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py index dd1f328b..080a80ea 100644 --- a/libmproxy/cmdline.py +++ b/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 diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py index a56a94c5..c897db85 100644 --- a/libmproxy/console/contentview.py +++ b/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 diff --git a/libmproxy/console/flowdetailview.py b/libmproxy/console/flowdetailview.py index ad2a4703..2dcaec27 100644 --- a/libmproxy/console/flowdetailview.py +++ b/libmproxy/console/flowdetailview.py @@ -15,7 +15,6 @@ import urwid import common -from .. import filt, version footer = [ ('heading_key', "q"), ":back ", diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py index 35bcc3ea..bc8450b9 100644 --- a/libmproxy/console/flowview.py +++ b/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 = [] diff --git a/libmproxy/filt.py b/libmproxy/filt.py index 0e0a82f1..3e4ebe57 100644 --- a/libmproxy/filt.py +++ b/libmproxy/filt.py @@ -40,7 +40,6 @@ """ import re, sys import contrib.pyparsing as pp -import flow class _Token: diff --git a/libmproxy/utils.py b/libmproxy/utils.py index d8345399..e9c90320 100644 --- a/libmproxy/utils.py +++ b/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(): |