From 521159c599f9eafee3e01df490e14ada58e17d2f Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Tue, 5 Jul 2016 23:14:12 +0100 Subject: Always import Win from base_wins. --- poezio/windows/bookmark_forms.py | 2 +- poezio/windows/data_forms.py | 2 +- poezio/windows/info_bar.py | 2 +- poezio/windows/info_wins.py | 2 +- poezio/windows/input_placeholders.py | 2 +- poezio/windows/inputs.py | 3 +-- poezio/windows/list.py | 2 +- poezio/windows/misc.py | 2 +- poezio/windows/muc.py | 2 +- poezio/windows/roster_win.py | 2 +- poezio/windows/text_win.py | 3 +-- 11 files changed, 11 insertions(+), 13 deletions(-) diff --git a/poezio/windows/bookmark_forms.py b/poezio/windows/bookmark_forms.py index 7aaee65a..47173738 100644 --- a/poezio/windows/bookmark_forms.py +++ b/poezio/windows/bookmark_forms.py @@ -3,7 +3,7 @@ Windows used inthe bookmarkstab """ import curses -from poezio.windows import Win +from poezio.windows.base_wins import Win from poezio.windows.inputs import Input from poezio.windows.data_forms import FieldInput from poezio.theming import to_curses_attr, get_theme diff --git a/poezio/windows/data_forms.py b/poezio/windows/data_forms.py index 8c4e9a7c..b7e5bc37 100644 --- a/poezio/windows/data_forms.py +++ b/poezio/windows/data_forms.py @@ -6,7 +6,7 @@ does not inherit from the Win base class), as it will create the others when needed. """ -from poezio.windows import Win +from poezio.windows.base_wins import Win from poezio.windows.inputs import Input from poezio.theming import to_curses_attr, get_theme diff --git a/poezio/windows/info_bar.py b/poezio/windows/info_bar.py index ed9dc385..cac56db9 100644 --- a/poezio/windows/info_bar.py +++ b/poezio/windows/info_bar.py @@ -12,7 +12,7 @@ import curses from poezio.config import config -from poezio.windows import Win +from poezio.windows.base_wins import Win from poezio.theming import get_theme, to_curses_attr class GlobalInfoBar(Win): diff --git a/poezio/windows/info_wins.py b/poezio/windows/info_wins.py index 938128ed..1d1b5683 100644 --- a/poezio/windows/info_wins.py +++ b/poezio/windows/info_wins.py @@ -9,7 +9,7 @@ log = logging.getLogger(__name__) from poezio.common import safeJID from poezio.config import config -from poezio.windows import Win +from poezio.windows.base_wins import Win from poezio.windows.funcs import truncate_nick from poezio.theming import get_theme, to_curses_attr diff --git a/poezio/windows/input_placeholders.py b/poezio/windows/input_placeholders.py index 4617392e..dd7468a7 100644 --- a/poezio/windows/input_placeholders.py +++ b/poezio/windows/input_placeholders.py @@ -7,7 +7,7 @@ import logging log = logging.getLogger(__name__) -from poezio.windows import Win +from poezio.windows.base_wins import Win from poezio.theming import get_theme, to_curses_attr diff --git a/poezio/windows/inputs.py b/poezio/windows/inputs.py index 51b9f4ea..a48ee84f 100644 --- a/poezio/windows/inputs.py +++ b/poezio/windows/inputs.py @@ -11,8 +11,7 @@ import string from poezio import keyboard from poezio import common from poezio import poopt -from poezio.windows import Win -from poezio.windows.base_wins import format_chars +from poezio.windows.base_wins import Win, format_chars from poezio.windows.funcs import find_first_format_char from poezio.config import config from poezio.theming import to_curses_attr diff --git a/poezio/windows/list.py b/poezio/windows/list.py index 64d6a2bf..c0dc44cf 100644 --- a/poezio/windows/list.py +++ b/poezio/windows/list.py @@ -7,7 +7,7 @@ log = logging.getLogger(__name__) import curses -from poezio.windows import Win +from poezio.windows.base_wins import Win from poezio.theming import to_curses_attr, get_theme diff --git a/poezio/windows/misc.py b/poezio/windows/misc.py index 0b6bd629..634248fb 100644 --- a/poezio/windows/misc.py +++ b/poezio/windows/misc.py @@ -7,7 +7,7 @@ log = logging.getLogger(__name__) import curses -from poezio.windows import Win +from poezio.windows.base_wins import Win from poezio.theming import get_theme, to_curses_attr class VerticalSeparator(Win): diff --git a/poezio/windows/muc.py b/poezio/windows/muc.py index 897b9f81..8b72d24c 100644 --- a/poezio/windows/muc.py +++ b/poezio/windows/muc.py @@ -7,7 +7,7 @@ log = logging.getLogger(__name__) import curses -from poezio.windows import Win +from poezio.windows.base_wins import Win from poezio import poopt from poezio.config import config diff --git a/poezio/windows/roster_win.py b/poezio/windows/roster_win.py index f940963c..f8ca90a2 100644 --- a/poezio/windows/roster_win.py +++ b/poezio/windows/roster_win.py @@ -7,7 +7,7 @@ log = logging.getLogger(__name__) from datetime import datetime -from poezio.windows import Win +from poezio.windows.base_wins import Win from poezio import common from poezio.config import config diff --git a/poezio/windows/text_win.py b/poezio/windows/text_win.py index c03c08d0..4b16043d 100644 --- a/poezio/windows/text_win.py +++ b/poezio/windows/text_win.py @@ -9,8 +9,7 @@ log = logging.getLogger(__name__) import curses from math import ceil, log10 -from poezio.windows import Win -from poezio.windows.base_wins import FORMAT_CHAR +from poezio.windows.base_wins import Win, FORMAT_CHAR from poezio.windows.funcs import truncate_nick, parse_attrs from poezio import poopt -- cgit v1.2.3