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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Maximilian Hils 2013-12-09 19:10:40 +01:00
commit 2be19a5620
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmproxy/console/__init__.py
View File

@ -173,7 +173,7 @@ class StatusBar(common.WWrap):
if opts: if opts:
r.append("[%s]"%(":".join(opts))) r.append("[%s]"%(":".join(opts)))
if self.master.script: if self.master.scripts:
r.append("[script:%s]"%self.master.script.path) r.append("[script:%s]"%self.master.script.path)
if self.master.debug: if self.master.debug:
@ -880,7 +880,7 @@ class ConsoleMaster(flow.FlowMaster):
) )
) )
elif k == "s": elif k == "s":
if self.script: if self.scripts:
self.load_script(None) self.load_script(None)
else: else:
self.path_prompt( self.path_prompt(