aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2012-07-23 18:47:03 -0700
committerAldo Cortesi <aldo@corte.si>2012-07-23 18:47:03 -0700
commita5bf9d3eb3da9de9aa9438de3c192a3023c90e6c (patch)
treeb56123cc44175b752e17fe1774826e7ffbbc291b /libmproxy/console
parent4ce309107a13753fe002d13166ff2bbe532e8148 (diff)
parentc643234c985ff320f15f0e2047f91a5076ea332d (diff)
downloadmitmproxy-a5bf9d3eb3da9de9aa9438de3c192a3023c90e6c.tar.gz
mitmproxy-a5bf9d3eb3da9de9aa9438de3c192a3023c90e6c.tar.bz2
mitmproxy-a5bf9d3eb3da9de9aa9438de3c192a3023c90e6c.zip
Merge pull request #54 from mhils/fix_r_option
fix -r option, read file in binary mode
Diffstat (limited to 'libmproxy/console')
-rw-r--r--libmproxy/console/__init__.py2
1 files changed, 1 insertions, 1 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