Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 00:01:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/runeh/master' into runeh

Browse Source
This commit is contained in:
Aldo Cortesi 2012-02-25 13:02:12 +13:00
commit 3afa2c38fb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libmproxy/console/__init__.py
View File

@ -13,7 +13,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # 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 os.path, sys
import urwid import urwid
from .. import controller, utils, flow, version from .. import controller, utils, flow, version
@ -433,7 +433,8 @@ class ConsoleMaster(flow.FlowMaster):
#If no EDITOR is set, assume 'vi' #If no EDITOR is set, assume 'vi'
if not c: if not c:
c = "vi" c = "vi"
cmd = [c, name] cmd = shlex.split(c)
cmd.append(name)
self.ui.stop() self.ui.stop()
try: try:
subprocess.call(cmd) subprocess.call(cmd)