diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-12-09 19:10:40 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-12-09 19:10:40 +0100 |
| commit | 2be19a5620829db198491c2f84b13a77b0ab01dd (patch) | |
| tree | 98ea95a3f902754ea7e73ac3943d89985975e75f /libmproxy | |
| parent | 4984bbb83ba3f6cbdfdd93520c6e3283709fea45 (diff) | |
| parent | 1d536f64d5de8b4ca3fe17814d4c0fbfb1b0f881 (diff) | |
| download | mitmproxy-2be19a5620829db198491c2f84b13a77b0ab01dd.tar.gz mitmproxy-2be19a5620829db198491c2f84b13a77b0ab01dd.tar.bz2 mitmproxy-2be19a5620829db198491c2f84b13a77b0ab01dd.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/console/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index b2c1deef..e5a0283c 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -173,7 +173,7 @@ class StatusBar(common.WWrap): if opts: r.append("[%s]"%(":".join(opts))) - if self.master.script: + if self.master.scripts: r.append("[script:%s]"%self.master.script.path) if self.master.debug: @@ -880,7 +880,7 @@ class ConsoleMaster(flow.FlowMaster): ) ) elif k == "s": - if self.script: + if self.scripts: self.load_script(None) else: self.path_prompt( |