Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jim Shaver 2015-03-18 00:25:22 -04:00
commit 972f612090
2 changed files with 2 additions and 2 deletions

View File

@ -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)

View File

@ -25,7 +25,7 @@ deps = {
}
script_deps = {
"mitmproxy": {
"urwid>=1.1",
"urwid>=1.3",
"lxml>=3.3.6",
"Pillow>=2.3.0",
},