diff options
author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2015-06-18 18:12:11 +0200 |
---|---|---|
committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2015-06-18 18:15:22 +0200 |
commit | 7a3623a14ee2ffa021c1a2a8f337826e055b328d (patch) | |
tree | 7abdfdba135ea1f6022a8a72b1c52371f76fbea2 /libpathod/pathod.py | |
parent | 90aeda47aead50110ee4a0a29b01edd170539818 (diff) | |
download | mitmproxy-7a3623a14ee2ffa021c1a2a8f337826e055b328d.tar.gz mitmproxy-7a3623a14ee2ffa021c1a2a8f337826e055b328d.tar.bz2 mitmproxy-7a3623a14ee2ffa021c1a2a8f337826e055b328d.zip |
fix pep8 whitespace
Diffstat (limited to 'libpathod/pathod.py')
-rw-r--r-- | libpathod/pathod.py | 69 |
1 files changed, 35 insertions, 34 deletions
diff --git a/libpathod/pathod.py b/libpathod/pathod.py index 695f62a5..76170990 100644 --- a/libpathod/pathod.py +++ b/libpathod/pathod.py @@ -29,6 +29,7 @@ class PathodError(Exception): class SSLOptions(object): + def __init__( self, confdir=CONFDIR, @@ -92,7 +93,7 @@ class PathodHandler(tcp.BaseHandler): language.serve(err, self.wfile, self.settings) return None, dict( type="error", - msg = error + msg=error ) if self.server.explain and not hasattr(crafted, 'is_error_response'): @@ -116,17 +117,17 @@ class PathodHandler(tcp.BaseHandler): started = time.time() try: frm = websockets.Frame.from_file(self.rfile) - except tcp.NetLibIncomplete, e: - lg("Error reading websocket frame: %s"%e) + except tcp.NetLibIncomplete as e: + lg("Error reading websocket frame: %s" % e) break ended = time.time() lg(frm.human_readable()) retlog = dict( - type = "inbound", - protocol = "websockets", - started = started, - duration = ended - started, - frame = dict( + type="inbound", + protocol="websockets", + started=started, + duration=ended - started, + frame=dict( ), cipher=None, ) @@ -138,7 +139,7 @@ class PathodHandler(tcp.BaseHandler): nest = frm.payload[len(ld):] try: wf_gen = language.parse_websocket_frame(nest) - except language.exceptions.ParseException, v: + except language.exceptions.ParseException as v: log.write( self.logfp, "Parse error in reflected frame specifcation:" @@ -509,7 +510,7 @@ class Pathod(tcp.TCPServer): self.anchors = anchors self.settings = language.Settings( - staticdir = self.staticdir + staticdir=self.staticdir ) def check_policy(self, req, settings): @@ -587,13 +588,13 @@ class Pathod(tcp.TCPServer): def main(args): # pragma: nocover ssloptions = SSLOptions( - cn = args.cn, - confdir = args.confdir, - not_after_connect = args.ssl_not_after_connect, - ciphers = args.ciphers, - sslversion = utils.SSLVERSIONS[args.sslversion], - certs = args.ssl_certs, - sans = args.sans, + cn=args.cn, + confdir=args.confdir, + not_after_connect=args.ssl_not_after_connect, + ciphers=args.ciphers, + sslversion=utils.SSLVERSIONS[args.sslversion], + certs=args.ssl_certs, + sans=args.sans, ) root = logging.getLogger() @@ -619,23 +620,23 @@ def main(args): # pragma: nocover try: pd = Pathod( (args.address, args.port), - craftanchor = args.craftanchor, - ssl = args.ssl, - ssloptions = ssloptions, - staticdir = args.staticdir, - anchors = args.anchors, - sizelimit = args.sizelimit, - noweb = args.noweb, - nocraft = args.nocraft, - noapi = args.noapi, - nohang = args.nohang, - timeout = args.timeout, - logreq = args.logreq, - logresp = args.logresp, - hexdump = args.hexdump, - http2_framedump = args.http2_framedump, - explain = args.explain, - webdebug = args.webdebug + craftanchor=args.craftanchor, + ssl=args.ssl, + ssloptions=ssloptions, + staticdir=args.staticdir, + anchors=args.anchors, + sizelimit=args.sizelimit, + noweb=args.noweb, + nocraft=args.nocraft, + noapi=args.noapi, + nohang=args.nohang, + timeout=args.timeout, + logreq=args.logreq, + logresp=args.logresp, + hexdump=args.hexdump, + http2_framedump=args.http2_framedump, + explain=args.explain, + webdebug=args.webdebug ) except PathodError as v: print >> sys.stderr, "Error: %s" % v |