diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-05-31 01:21:44 -0400 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-05-31 01:21:44 -0400 |
| commit | b51363b3ca43f6572acb673186e6ae78a1f48434 (patch) | |
| tree | a7488b32871c142141a813dc6ff2ede172672c31 /examples/read_dumpfile | |
| parent | 4fe2c069cca07aadf983f54e18dac4de492d5d69 (diff) | |
| parent | 06fba18106a8f759ec6f08453e86772a170c653b (diff) | |
| download | mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.gz mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.bz2 mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.zip | |
Merge remote-tracking branch 'upstream/master' into print-bracket-fix
Conflicts:
examples/har_extractor.py
examples/nonblocking.py
examples/read_dumpfile
libmproxy/web/app.py
Diffstat (limited to 'examples/read_dumpfile')
| -rw-r--r-- | examples/read_dumpfile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/examples/read_dumpfile b/examples/read_dumpfile index 82bf832d..2238d2d2 100644 --- a/examples/read_dumpfile +++ b/examples/read_dumpfile @@ -4,7 +4,8 @@ # from libmproxy import flow -import json, sys +import json +import sys with open("logfile", "rb") as logfile: freader = flow.FlowReader(logfile) @@ -14,5 +15,5 @@ with open("logfile", "rb") as logfile: print(f.request.host) json.dump(f.get_state(), sys.stdout, indent=4) print("") - except flow.FlowReadError, v: - print("Flow file corrupted. Stopped loading.") + except flow.FlowReadError as v: + print "Flow file corrupted. Stopped loading." |