diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-06-16 00:23:44 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-06-16 00:23:44 +0200 |
| commit | ba47690a030ab9c0008a4eb229413c01d1f5a477 (patch) | |
| tree | 30d34a8e04572e39242ba20ceb3f9734e1b33a56 /libmproxy | |
| parent | d3beaa738223947390bc66cdb649bf3cbaba6c28 (diff) | |
| download | mitmproxy-ba47690a030ab9c0008a4eb229413c01d1f5a477.tar.gz mitmproxy-ba47690a030ab9c0008a4eb229413c01d1f5a477.tar.bz2 mitmproxy-ba47690a030ab9c0008a4eb229413c01d1f5a477.zip | |
always read files in binary mode
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/cmdline.py | 2 | ||||
| -rw-r--r-- | libmproxy/console/__init__.py | 4 | ||||
| -rw-r--r-- | libmproxy/console/grideditor.py | 2 | ||||
| -rw-r--r-- | libmproxy/dump.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py index b76792cf..6b6c4241 100644 --- a/libmproxy/cmdline.py +++ b/libmproxy/cmdline.py @@ -124,7 +124,7 @@ def get_common_options(options): except ParseException, e: raise OptionException(e.message) try: - v = open(path, "r").read() + v = open(path, "rb").read() except IOError, e: raise OptionException("Could not read replace file: %s"%path) reps.append((patt, rex, v)) 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 diff --git a/libmproxy/console/grideditor.py b/libmproxy/console/grideditor.py index 314d6e88..55f3ba0f 100644 --- a/libmproxy/console/grideditor.py +++ b/libmproxy/console/grideditor.py @@ -294,7 +294,7 @@ class GridEditor(common.WWrap): if p: try: p = os.path.expanduser(p) - d = file(p, "r").read() + d = file(p, "rb").read() self.walker.set_current_value(d, unescaped) self.walker._modified() except IOError, v: diff --git a/libmproxy/dump.py b/libmproxy/dump.py index b1022ef5..06c15c63 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -141,7 +141,7 @@ class DumpMaster(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: raise DumpError(v.strerror) |