Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2025-01-30 14:58:38 +00:00
Code Issues Projects Releases Wiki Activity

Fix a traceback that sometimes occurred when an invalid limit was entered.

Browse Source
This commit is contained in:
Aldo Cortesi 2012-06-02 18:41:44 -07:00
parent f9b04b84cd
commit b36e37f9da
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libmproxy/console/__init__.py
View File

@ -94,6 +94,7 @@ class PathEdit(urwid.Edit, _PathCompleter):
class ActionBar(common.WWrap):
def __init__(self):
self.message("")
self.expire = None
def selectable(self):
return True
@ -102,6 +103,7 @@ class ActionBar(common.WWrap):
self.w = PathEdit(prompt, text)
def prompt(self, prompt, text = ""):
self.expire = None
# A (partial) workaround for this Urwid issue:
# https://github.com/Nic0/tyrs/issues/115
# We can remove it once veryone is beyond 1.0.1
@ -109,14 +111,14 @@ class ActionBar(common.WWrap):
prompt = unicode(prompt)
self.w = urwid.Edit(prompt, text or "")
def message(self, message):
def message(self, message, expire=None):
self.expire = expire
self.w = urwid.Text(message)
class StatusBar(common.WWrap):
def __init__(self, master, helptext):
self.master, self.helptext = master, helptext
self.expire = None
self.ab = ActionBar()
self.ib = common.WWrap(urwid.Text(""))
self.w = urwid.Pile([self.ib, self.ab])
@ -188,7 +190,7 @@ class StatusBar(common.WWrap):
return r
def redraw(self):
if self.expire and time.time() > self.expire:
if self.ab.expire and time.time() > self.ab.expire:
self.message("")
fc = self.master.state.flow_count()
@ -238,10 +240,8 @@ class StatusBar(common.WWrap):
def message(self, msg, expire=None):
if expire:
self.expire = time.time() + float(expire)/1000
else:
self.expire = None
self.ab.message(msg)
expire = time.time() + float(expire)/1000
self.ab.message(msg, expire)
self.master.drawscreen()

2
libmproxy/script.py
View File

@ -58,7 +58,7 @@ class Script:
(True, retval) on success.
(False, None) on nonexistent method.
(Fals, (exc, traceback string)) if there was an exception.
(False, (exc, traceback string)) if there was an exception.
"""
f = self.ns.get(name)
if f: