diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-02-25 13:02:12 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-02-25 13:02:12 +1300 |
| commit | 3afa2c38fb8e95b417be134ef4c137b0829a8621 (patch) | |
| tree | 6d0d6ecc9b7ebb3900d3eec02989bdb18ea59db0 /libmproxy | |
| parent | 7789b602c84ad611a0590f42a542575c54ce50d2 (diff) | |
| parent | bbfdc7b7de21434cf14b639fd9e9d65c55cff530 (diff) | |
| download | mitmproxy-3afa2c38fb8e95b417be134ef4c137b0829a8621.tar.gz mitmproxy-3afa2c38fb8e95b417be134ef4c137b0829a8621.tar.bz2 mitmproxy-3afa2c38fb8e95b417be134ef4c137b0829a8621.zip | |
Merge remote-tracking branch 'remotes/runeh/master' into runeh
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/console/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 2039d7b1..5b2ec0cd 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -import mailcap, mimetypes, tempfile, os, subprocess, glob, time +import mailcap, mimetypes, tempfile, os, subprocess, glob, time, shlex import os.path, sys import urwid from .. import controller, utils, flow, version @@ -433,7 +433,8 @@ class ConsoleMaster(flow.FlowMaster): #If no EDITOR is set, assume 'vi' if not c: c = "vi" - cmd = [c, name] + cmd = shlex.split(c) + cmd.append(name) self.ui.stop() try: subprocess.call(cmd) |