diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2012-07-24 03:06:12 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2012-07-24 03:11:28 +0200 |
| commit | c643234c985ff320f15f0e2047f91a5076ea332d (patch) | |
| tree | b56123cc44175b752e17fe1774826e7ffbbc291b /libmproxy | |
| parent | 4ce309107a13753fe002d13166ff2bbe532e8148 (diff) | |
| download | mitmproxy-c643234c985ff320f15f0e2047f91a5076ea332d.tar.gz mitmproxy-c643234c985ff320f15f0e2047f91a5076ea332d.tar.bz2 mitmproxy-c643234c985ff320f15f0e2047f91a5076ea332d.zip | |
fix -r option, read file in binary mode
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/console/__init__.py | 2 | ||||
| -rw-r--r-- | libmproxy/dump.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 1096f04c..bad73e91 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -649,7 +649,7 @@ class ConsoleMaster(flow.FlowMaster): self.state.last_saveload = path path = os.path.expanduser(path) try: - f = file(path, "r") + f = file(path, "rb") fr = flow.FlowReader(f) except IOError, v: return v.strerror diff --git a/libmproxy/dump.py b/libmproxy/dump.py index 1f90184b..9ad6c327 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -121,7 +121,7 @@ class DumpMaster(flow.FlowMaster): if options.rfile: path = os.path.expanduser(options.rfile) try: - f = file(path, "r") + f = file(path, "rb") freader = flow.FlowReader(f) except IOError, v: raise DumpError(v.strerror) |