Always import Win from base_wins.

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

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

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

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
 

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
 
 

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

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
 
 

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

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

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

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