aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2014-03-07 15:22:04 +1300
committerAldo Cortesi <aldo@nullcube.com>2014-03-07 15:22:04 +1300
commit9b17d272a351c2f63748a565dcdb9823f9cea34b (patch)
treefd9f66e9f1a3c334d03cd41f20b2b379159dbc88
parentd0e6fa270533689fdaca0daab2d9dfa209bdfc26 (diff)
parent5ca88300a95a01bb36a7751579c46b6ec2c3e156 (diff)
downloadmitmproxy-9b17d272a351c2f63748a565dcdb9823f9cea34b.tar.gz
mitmproxy-9b17d272a351c2f63748a565dcdb9823f9cea34b.tar.bz2
mitmproxy-9b17d272a351c2f63748a565dcdb9823f9cea34b.zip
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
-rw-r--r--libmproxy/console/__init__.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py
index 4f298698..4a58e771 100644
--- a/libmproxy/console/__init__.py
+++ b/libmproxy/console/__init__.py
@@ -77,7 +77,6 @@ class PathEdit(urwid.Edit, _PathCompleter):
class ActionBar(common.WWrap):
def __init__(self):
self.message("")
- self.expire = None
def selectable(self):
return True