From ba47690a030ab9c0008a4eb229413c01d1f5a477 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Sun, 16 Jun 2013 00:23:44 +0200
Subject: always read files in binary mode

---
 libmproxy/console/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libmproxy/console/__init__.py')

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
-- 
cgit v1.2.3