diff options
author | Hugo Osvaldo Barrera <hugo@whynothugo.nl> | 2024-01-11 16:28:28 +0100 |
---|---|---|
committer | Christian Geier <geier@lostpackets.de> | 2024-01-21 13:32:59 +0100 |
commit | 768003148015376f1715a2d4cc0b3d6d800876c4 (patch) | |
tree | 94baa24a8fd66837e4636819a0f20bc51dc25efb | |
parent | 300aff0052298acb3c698aca70e77f35eef557de (diff) |
Update deprecated syntax
Squelches 165 warnings from tests.
-rw-r--r-- | khal/ui/calendarwidget.py | 6 | ||||
-rw-r--r-- | khal/ui/editor.py | 2 | ||||
-rw-r--r-- | khal/ui/widgets.py | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/khal/ui/calendarwidget.py b/khal/ui/calendarwidget.py index 34b2d984..38de6a28 100644 --- a/khal/ui/calendarwidget.py +++ b/khal/ui/calendarwidget.py @@ -165,7 +165,7 @@ class DateCColumns(urwid.Columns): @focus_position.setter def focus_position(self, position: int) -> None: - """calls on_date_change before calling super()._set_focus_position""" + """calls on_date_change before setting super().focus_position""" # do not call when building up the interface, lots of potentially # expensive calls made here if self._init: @@ -180,7 +180,7 @@ class DateCColumns(urwid.Columns): def set_focus_date(self, a_date: dt.date) -> None: for num, day in enumerate(self.contents[1:8], 1): if day[0].date == a_date: - self._set_focus_position(num) + self.focus_position = num return None raise ValueError('%s not found in this week' % a_date) @@ -430,7 +430,7 @@ class CalendarWalker(urwid.SimpleFocusListWalker): self.reset(a_day) row, column = self.get_date_pos(a_day) self.set_focus(row) - self[self.focus]._set_focus_position(column) + self[self.focus].focus_position = (column) @property def earliest_date(self) -> dt.date: diff --git a/khal/ui/editor.py b/khal/ui/editor.py index c9b5975d..82a9220e 100644 --- a/khal/ui/editor.py +++ b/khal/ui/editor.py @@ -64,7 +64,7 @@ class CalendarPopUp(urwid.PopUpLauncher): self._monthdisplay = monthdisplay self._firstweekday = firstweekday self._keybindings = {} if keybindings is None else keybindings - self.__super.__init__(widget) + super().__init__(widget) def keypress(self, size, key): if key == 'enter': diff --git a/khal/ui/widgets.py b/khal/ui/widgets.py index 4a793ab6..568c6af2 100644 --- a/khal/ui/widgets.py +++ b/khal/ui/widgets.py @@ -258,7 +258,7 @@ class ChoiceList(urwid.WidgetWrap): pile = NPile(buttons, outermost=True) num = [num for num, elem in enumerate(parent.choices) if elem == parent.active][0] - pile.set_focus(num) + pile.focus_position = num fill = urwid.Filler(pile) urwid.WidgetWrap.__init__(self, urwid.AttrMap(fill, 'popupbg')) @@ -287,14 +287,14 @@ class NextMixin(SupportsNext): def _select_first_selectable(self): """select our first selectable item (recursivly if that item SupportsNext)""" i = self._first_selectable() - self.set_focus(i) + self.focus_position = i if isinstance(self.contents[i][0], SupportsNext): self.contents[i][0]._select_first_selectable() def _select_last_selectable(self): """select our last selectable item (recursivly if that item SupportsNext)""" i = self._last_selectable() - self.set_focus(i) + self.focus_position = i if isinstance(self._contents[i][0], SupportsNext): self.contents[i][0]._select_last_selectable() @@ -321,7 +321,7 @@ class NextMixin(SupportsNext): else: for i in range(self.focus_position + 1, len(self._contents)): if self._contents[i][0].selectable(): - self.set_focus(i) + self.focus_position = i if isinstance(self._contents[i][0], SupportsNext): self._contents[i][0]._select_first_selectable() break @@ -333,7 +333,7 @@ class NextMixin(SupportsNext): else: for i in range(self.focus_position - 1, 0 - 1, -1): if self._contents[i][0].selectable(): - self.set_focus(i) + self.focus_position = i if isinstance(self._contents[i][0], SupportsNext): self._contents[i][0]._select_last_selectable() break @@ -355,14 +355,14 @@ class NListBox(SupportsNext, urwid.ListBox): def _select_first_selectable(self): """select our first selectable item (recursivly if that item SupportsNext)""" i = self._first_selectable() - self.set_focus(i) + self.focus_position = i if isinstance(self.body[i], SupportsNext): self.body[i]._select_first_selectable() def _select_last_selectable(self): """select our last selectable item (recursivly if that item SupportsNext)""" i = self._last_selectable() - self.set_focus(i) + self.focus_position = i if isinstance(self.body[i], SupportsNext): self.body[i]._select_last_selectable() |