Merge remote-tracking branch 'upstream/master'

2 files changed, 2 insertions, 2 deletions

diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py
index 70bd46d3..1b65ae68 100644
--- a/libmproxy/console/__init__.py
+++ b/libmproxy/console/__init__.py
@@ -248,7 +248,7 @@ class StatusBar(urwid.WidgetWrap):
         return True
 
     def get_edit_text(self):
-        return self.ab.w.get_edit_text()
+        return self.ab._w.get_edit_text()
 
     def path_prompt(self, prompt, text):
         return self.ab.path_prompt(prompt, text)
diff --git a/setup.py b/setup.py
index f7519cd3..fd3e6657 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ deps = {
 }
 script_deps = {
     "mitmproxy": {
-        "urwid>=1.1",
+        "urwid>=1.3",
         "lxml>=3.3.6",
         "Pillow>=2.3.0",
     },