From 57d6650e8e1243a66fbaf3d4124c592638e8af91 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 29 Oct 2012 09:30:59 +1300 Subject: [PATCH] Urwid 1.1 compatibility. --- libmproxy/console/__init__.py | 4 ++-- libmproxy/console/flowlist.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 1153bdcd0..544fbd6e4 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -431,7 +431,7 @@ class ConsoleMaster(flow.FlowMaster): return str(v) self.stream_path = path - + def _run_script_method(self, method, s, f): status, val = s.run(method, f) if val: @@ -1007,7 +1007,7 @@ class ConsoleMaster(flow.FlowMaster): self.eventlist.append(e) if len(self.eventlist) > EVENTLOG_SIZE: self.eventlist.pop(0) - self.eventlist.set_focus(len(self.eventlist)) + self.eventlist.set_focus(len(self.eventlist)-1) # Handlers def handle_log(self, l): diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py index 2b4436368..1fdd92b79 100644 --- a/libmproxy/console/flowlist.py +++ b/libmproxy/console/flowlist.py @@ -102,12 +102,12 @@ class BodyPile(urwid.Pile): class ConnectionItem(common.WWrap): def __init__(self, master, state, flow, focus): self.master, self.state, self.flow = master, state, flow - self.focus = focus + self.f = focus w = self.get_text() common.WWrap.__init__(self, w) def get_text(self): - return common.format_flow(self.flow, self.focus) + return common.format_flow(self.flow, self.f) def selectable(self): return True