diff options
author | Aldo Cortesi <aldo@corte.si> | 2013-06-15 15:31:36 -0700 |
---|---|---|
committer | Aldo Cortesi <aldo@corte.si> | 2013-06-15 15:31:36 -0700 |
commit | 34f286df511d0d6987a21e105a7cde651130fa2d (patch) | |
tree | 30d34a8e04572e39242ba20ceb3f9734e1b33a56 /libmproxy/console/__init__.py | |
parent | d3beaa738223947390bc66cdb649bf3cbaba6c28 (diff) | |
parent | ba47690a030ab9c0008a4eb229413c01d1f5a477 (diff) | |
download | mitmproxy-34f286df511d0d6987a21e105a7cde651130fa2d.tar.gz mitmproxy-34f286df511d0d6987a21e105a7cde651130fa2d.tar.bz2 mitmproxy-34f286df511d0d6987a21e105a7cde651130fa2d.zip |
Merge pull request #136 from mhils/fix_binary_rw
always read files in binary mode
Diffstat (limited to 'libmproxy/console/__init__.py')
-rw-r--r-- | libmproxy/console/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index ba699d33..ef799167 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -479,7 +479,7 @@ class ConsoleMaster(flow.FlowMaster): def _readflow(self, path): path = os.path.expanduser(path) try: - f = file(path, "r") + f = file(path, "rb") flows = list(flow.FlowReader(f).stream()) except (IOError, flow.FlowReadError), v: return True, v.strerror @@ -519,7 +519,7 @@ class ConsoleMaster(flow.FlowMaster): except: self.statusbar.message("Can't start editor: %s" % " ".join(c)) else: - data = open(name).read() + data = open(name,"rb").read() self.ui.start() os.unlink(name) return data |