diff options
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/cmdline.py | 2 | ||||
| -rw-r--r-- | libmproxy/console/__init__.py | 2 | ||||
| -rw-r--r-- | libmproxy/console/contentview.py | 2 | ||||
| -rw-r--r-- | libmproxy/filt.py | 2 | ||||
| -rw-r--r-- | libmproxy/flow.py | 8 | ||||
| -rw-r--r-- | libmproxy/platform/linux.py | 2 | ||||
| -rw-r--r-- | libmproxy/proxy.py | 15 | ||||
| -rw-r--r-- | libmproxy/utils.py | 2 |
8 files changed, 15 insertions, 20 deletions
diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py index 388607af..e221a872 100644 --- a/libmproxy/cmdline.py +++ b/libmproxy/cmdline.py @@ -1,8 +1,6 @@ import proxy import re, filt import argparse -import shlex -import os APP_HOST = "mitm" APP_PORT = 80 diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 536b0bac..a316602c 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -1,7 +1,7 @@ import mailcap, mimetypes, tempfile, os, subprocess, glob, time, shlex, stat import os.path, sys, weakref import urwid -from .. import controller, utils, flow +from .. import controller, utils, flow, script import flowlist, flowview, help, common, grideditor, palettes, contentview, flowdetailview EVENTLOG_SIZE = 500 diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py index a5cb679e..d39d1b9c 100644 --- a/libmproxy/console/contentview.py +++ b/libmproxy/console/contentview.py @@ -490,7 +490,7 @@ def get_content_view(viewmode, hdrItems, content, limit, logfunc): try: ret = viewmode(hdrs, content, limit) # Third-party viewers can fail in unexpected ways... - except Exception, e: + except Exception: s = traceback.format_exc() s = "Content viewer failed: \n" + s logfunc(s) diff --git a/libmproxy/filt.py b/libmproxy/filt.py index 824429c7..6a0c3075 100644 --- a/libmproxy/filt.py +++ b/libmproxy/filt.py @@ -334,7 +334,7 @@ bnf = _make() def parse(s): try: return bnf.parseString(s, parseAll=True)[0] - except pp.ParseException, v: + except pp.ParseException: return None except ValueError: return None diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 4c778c40..76ca4f47 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 hashlib, Cookie, cookielib, copy, re, urlparse, os, threading +import hashlib, Cookie, cookielib, copy, re, urlparse, threading import time, urllib import tnetstring, filt, script, utils, encoding, proxy from email.utils import parsedate_tz, formatdate, mktime_tz @@ -1395,9 +1395,9 @@ class FlowMaster(controller.Master): pass def unload_scripts(self): - for script in self.scripts[:]: - script.unload() - self.scripts.remove(script) + for s in self.scripts[:]: + s.unload() + self.scripts.remove(s) def load_script(self, command): """ diff --git a/libmproxy/platform/linux.py b/libmproxy/platform/linux.py index 411d442e..d37f0fe8 100644 --- a/libmproxy/platform/linux.py +++ b/libmproxy/platform/linux.py @@ -1,4 +1,4 @@ -import socket, struct, fcntl +import socket, struct # Python socket module does not have this constant SO_ORIGINAL_DST = 80 diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index f2dcc43f..0d53aef8 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -1,8 +1,7 @@ -import sys, os, string, socket, time -import shutil, tempfile, threading -import SocketServer +import os, socket, time +import threading from OpenSSL import SSL -from netlib import odict, tcp, http, certutils, http_status, http_auth +from netlib import tcp, http, certutils, http_status, http_auth import utils, flow, version, platform, controller @@ -91,7 +90,6 @@ class RequestReplayThread(threading.Thread): server = ServerConnection(self.config, r.scheme, r.host, r.port, r.host) server.connect() server.send(r) - tsstart = utils.timestamp() httpversion, code, msg, headers, content = http.read_response( server.rfile, r.method, self.config.body_size_limit ) @@ -123,7 +121,7 @@ class HandleSNI: self.handler.sni = sn.decode("utf8").encode("idna") # An unhandled exception in this method will core dump PyOpenSSL, so # make dang sure it doesn't happen. - except Exception, e: # pragma: no cover + except Exception: # pragma: no cover pass @@ -240,7 +238,6 @@ class ProxyHandler(tcp.BaseHandler): request.ssl_setup_timestamp = sc.ssl_setup_timestamp sc.rfile.reset_timestamps() try: - tsstart = utils.timestamp() peername = sc.connection.getpeername() if peername: request.ip = peername[0] @@ -249,13 +246,13 @@ class ProxyHandler(tcp.BaseHandler): request.method, self.config.body_size_limit ) - except http.HttpErrorConnClosed, v: + except http.HttpErrorConnClosed: self.del_server_connection() if sc.requestcount > 1: continue else: raise - except http.HttpError, v: + except http.HttpError: raise ProxyError(502, "Invalid server response.") else: break diff --git a/libmproxy/utils.py b/libmproxy/utils.py index 961c6618..1ec4685d 100644 --- a/libmproxy/utils.py +++ b/libmproxy/utils.py @@ -1,4 +1,4 @@ -import os, datetime, urlparse, string, urllib, re +import os, datetime, urllib, re import time, functools, cgi import json from netlib import http |