diff options
author | Maximilian Hils <git@maximilianhils.com> | 2016-07-25 19:37:47 -0700 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2016-07-25 19:37:47 -0700 |
commit | 705d04262994c03fc77273b4b4df63bd014145c9 (patch) | |
tree | 43755faa13fba739f114df869e9845c85916eb88 | |
parent | 38b43cc9f91a8bb20e1bc726625bf750223bb80e (diff) | |
download | mitmproxy-705d04262994c03fc77273b4b4df63bd014145c9.tar.gz mitmproxy-705d04262994c03fc77273b4b4df63bd014145c9.tar.bz2 mitmproxy-705d04262994c03fc77273b4b4df63bd014145c9.zip |
fix #1432
-rw-r--r-- | mitmproxy/console/master.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mitmproxy/console/master.py b/mitmproxy/console/master.py index ad46cbb4..03ec8b63 100644 --- a/mitmproxy/console/master.py +++ b/mitmproxy/console/master.py @@ -13,6 +13,7 @@ import tempfile import traceback import weakref +import six import urwid from typing import Optional # noqa @@ -392,8 +393,13 @@ class ConsoleMaster(flow.FlowMaster): def spawn_editor(self, data): text = not isinstance(data, bytes) fd, name = tempfile.mkstemp('', "mproxy", text=text) - os.write(fd, data) - os.close(fd) + if six.PY2: + os.close(fd) + with open(name, "w" if text else "wb") as f: + f.write(data) + else: + with open(fd, "w" if text else "wb") as f: + f.write(data) # if no EDITOR is set, assume 'vi' c = os.environ.get("EDITOR") or "vi" cmd = shlex.split(c) |