From ab86e7991886c3d3253af59349403c5973fe476c Mon Sep 17 00:00:00 2001 From: mathieui Date: Thu, 30 Jun 2016 22:56:24 +0200 Subject: Use absolute imports instead of relative ones All this crap is very brittle due to circular deps and python handling them badly. This appears to be fixing some stuff, at the very least. This is sed, so cleanup of imports (which can now be grouped together) is not done yet. --- poezio/windows/base_wins.py | 2 +- poezio/windows/bookmark_forms.py | 4 ++-- poezio/windows/data_forms.py | 2 +- poezio/windows/info_bar.py | 4 ++-- poezio/windows/info_wins.py | 6 +++--- poezio/windows/input_placeholders.py | 2 +- poezio/windows/inputs.py | 10 +++++----- poezio/windows/list.py | 2 +- poezio/windows/misc.py | 2 +- poezio/windows/muc.py | 6 +++--- poezio/windows/roster_win.py | 10 +++++----- poezio/windows/text_win.py | 6 +++--- 12 files changed, 28 insertions(+), 28 deletions(-) (limited to 'poezio/windows') diff --git a/poezio/windows/base_wins.py b/poezio/windows/base_wins.py index f1f9b84b..a5629ed5 100644 --- a/poezio/windows/base_wins.py +++ b/poezio/windows/base_wins.py @@ -13,7 +13,7 @@ log = logging.getLogger(__name__) import curses import string -from .. theming import to_curses_attr, read_tuple +from poezio.theming import to_curses_attr, read_tuple FORMAT_CHAR = '\x19' # These are non-printable chars, so they should never appear in the input, diff --git a/poezio/windows/bookmark_forms.py b/poezio/windows/bookmark_forms.py index f7d72f78..bef4b247 100644 --- a/poezio/windows/bookmark_forms.py +++ b/poezio/windows/bookmark_forms.py @@ -6,8 +6,8 @@ import curses from . import Win from . inputs import Input from . data_forms import FieldInput -from .. theming import to_curses_attr, get_theme -from .. common import safeJID +from poezio.theming import to_curses_attr, get_theme +from poezio.common import safeJID class BookmarkJIDInput(FieldInput, Input): def __init__(self, field): diff --git a/poezio/windows/data_forms.py b/poezio/windows/data_forms.py index c02296e5..5b70cedc 100644 --- a/poezio/windows/data_forms.py +++ b/poezio/windows/data_forms.py @@ -9,7 +9,7 @@ others when needed. from . import Win from . inputs import Input -from .. theming import to_curses_attr, get_theme +from poezio.theming import to_curses_attr, get_theme class FieldInput(object): """ diff --git a/poezio/windows/info_bar.py b/poezio/windows/info_bar.py index be9f1f0c..dbaabdc0 100644 --- a/poezio/windows/info_bar.py +++ b/poezio/windows/info_bar.py @@ -11,9 +11,9 @@ log = logging.getLogger(__name__) import curses -from .. config import config +from poezio.config import config from . import Win -from .. theming import get_theme, to_curses_attr +from poezio.theming import get_theme, to_curses_attr class GlobalInfoBar(Win): def __init__(self, core): diff --git a/poezio/windows/info_wins.py b/poezio/windows/info_wins.py index 327f9b2b..6a8c9d64 100644 --- a/poezio/windows/info_wins.py +++ b/poezio/windows/info_wins.py @@ -6,12 +6,12 @@ info buffer in normal tabs import logging log = logging.getLogger(__name__) -from .. common import safeJID -from .. config import config +from poezio.common import safeJID +from poezio.config import config from . import Win from . funcs import truncate_nick -from .. theming import get_theme, to_curses_attr +from poezio.theming import get_theme, to_curses_attr class InfoWin(Win): """ diff --git a/poezio/windows/input_placeholders.py b/poezio/windows/input_placeholders.py index 92be4ffa..698cee09 100644 --- a/poezio/windows/input_placeholders.py +++ b/poezio/windows/input_placeholders.py @@ -8,7 +8,7 @@ log = logging.getLogger(__name__) from . import Win -from .. theming import get_theme, to_curses_attr +from poezio.theming import get_theme, to_curses_attr class HelpText(Win): diff --git a/poezio/windows/inputs.py b/poezio/windows/inputs.py index c204b503..da7b53d9 100644 --- a/poezio/windows/inputs.py +++ b/poezio/windows/inputs.py @@ -8,14 +8,14 @@ log = logging.getLogger(__name__) import curses import string -from .. import keyboard -from .. import common -from .. import poopt +from poezio import keyboard +from poezio import common +from poezio import poopt from . import Win from . base_wins import format_chars from . funcs import find_first_format_char -from .. config import config -from .. theming import to_curses_attr +from poezio.config import config +from poezio.theming import to_curses_attr class Input(Win): diff --git a/poezio/windows/list.py b/poezio/windows/list.py index d4458b5b..8e879c85 100644 --- a/poezio/windows/list.py +++ b/poezio/windows/list.py @@ -8,7 +8,7 @@ log = logging.getLogger(__name__) import curses from . import Win -from .. theming import to_curses_attr, get_theme +from poezio.theming import to_curses_attr, get_theme class ListWin(Win): diff --git a/poezio/windows/misc.py b/poezio/windows/misc.py index bc77fefd..230c06ad 100644 --- a/poezio/windows/misc.py +++ b/poezio/windows/misc.py @@ -8,7 +8,7 @@ log = logging.getLogger(__name__) import curses from . import Win -from .. theming import get_theme, to_curses_attr +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 4a0eb626..594c2157 100644 --- a/poezio/windows/muc.py +++ b/poezio/windows/muc.py @@ -9,9 +9,9 @@ import curses from . import Win -from .. import poopt -from .. config import config -from .. theming import to_curses_attr, get_theme +from poezio import poopt +from poezio.config import config +from poezio.theming import to_curses_attr, get_theme def userlist_to_cache(userlist): result = [] diff --git a/poezio/windows/roster_win.py b/poezio/windows/roster_win.py index e1c92073..a8d29228 100644 --- a/poezio/windows/roster_win.py +++ b/poezio/windows/roster_win.py @@ -9,11 +9,11 @@ from datetime import datetime from . import Win -from .. import common -from .. config import config -from .. contact import Contact, Resource -from .. roster import RosterGroup -from .. theming import get_theme, to_curses_attr +from poezio import common +from poezio.config import config +from poezio.contact import Contact, Resource +from poezio.roster import RosterGroup +from poezio.theming import get_theme, to_curses_attr class RosterWin(Win): diff --git a/poezio/windows/text_win.py b/poezio/windows/text_win.py index 1aad172c..b7186541 100644 --- a/poezio/windows/text_win.py +++ b/poezio/windows/text_win.py @@ -13,9 +13,9 @@ from . import Win from . base_wins import FORMAT_CHAR from . funcs import truncate_nick, parse_attrs -from .. import poopt -from .. config import config -from .. theming import to_curses_attr, get_theme, dump_tuple +from poezio import poopt +from poezio.config import config +from poezio.theming import to_curses_attr, get_theme, dump_tuple # msg is a reference to the corresponding Message object. text_start and -- cgit v1.2.3