From ca87c05ff25badda2eb67ff6581252a354625427 Mon Sep 17 00:00:00 2001 From: David Paleino Date: Fri, 16 Nov 2012 10:22:47 +0100 Subject: [PATCH] Really fix urwid 1.1.0 compatibility --- curses/curses_misc.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/curses/curses_misc.py b/curses/curses_misc.py index f75b546..925c34b 100644 --- a/curses/curses_misc.py +++ b/curses/curses_misc.py @@ -352,7 +352,7 @@ class ComboBox(urwid.WidgetWrap): if urwid.VERSION < (1, 1, 0): self.focus = focus else: - self.focus_position = focus + self._w.focus_position = focus self.callback = callback self.user_args = user_args @@ -368,7 +368,10 @@ class ComboBox(urwid.WidgetWrap): if urwid.VERSION < (1, 1, 0): self.focus = index else: - self.focus_position = index + try: + self._w.focus_position = index + except IndexError: + pass # API changed between urwid 0.9.8.4 and 0.9.9 try: @@ -386,7 +389,7 @@ class ComboBox(urwid.WidgetWrap): if urwid.VERSION < (1, 1, 0): index = self.focus else: - index = self.focus_position + index = self._w.focus_position self.cbox = DynWrap(SelText([self.list[index]+self.DOWN_ARROW]), attrs=self.attrs,focus_attr=self.focus_attr) @@ -434,7 +437,7 @@ class ComboBox(urwid.WidgetWrap): if urwid.VERSION < (1, 1, 0): return None, self.focus else: - return None, self.focus_position + return None, self._w.focus_position def get_sensitive(self): return self.cbox.get_sensitive()