summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--poezio/bookmarks.py4
-rw-r--r--poezio/common.py2
-rw-r--r--poezio/config.py4
-rw-r--r--poezio/connection.py8
-rw-r--r--poezio/contact.py2
-rw-r--r--poezio/core/commands.py24
-rw-r--r--poezio/core/completions.py12
-rw-r--r--poezio/core/core.py46
-rw-r--r--poezio/core/handlers.py28
-rw-r--r--poezio/decorators.py2
-rw-r--r--poezio/logger.py10
-rw-r--r--poezio/multiuserchat.py2
-rw-r--r--poezio/plugin.py4
-rw-r--r--poezio/plugin_manager.py10
-rw-r--r--poezio/poezio.py14
-rw-r--r--poezio/roster.py8
-rw-r--r--poezio/tabs/basetabs.py24
-rw-r--r--poezio/tabs/bookmarkstab.py8
-rw-r--r--poezio/tabs/conversationtab.py20
-rw-r--r--poezio/tabs/data_forms.py4
-rw-r--r--poezio/tabs/listtab.py6
-rw-r--r--poezio/tabs/muctab.py26
-rw-r--r--poezio/tabs/privatetab.py18
-rw-r--r--poezio/tabs/rostertab.py18
-rw-r--r--poezio/tabs/xmltab.py10
-rw-r--r--poezio/text_buffer.py4
-rwxr-xr-xpoezio/theming.py2
-rw-r--r--poezio/user.py4
-rw-r--r--poezio/windows/base_wins.py6
-rw-r--r--poezio/windows/bookmark_forms.py4
-rw-r--r--poezio/windows/data_forms.py2
-rw-r--r--poezio/windows/info_bar.py4
-rw-r--r--poezio/windows/info_wins.py6
-rw-r--r--poezio/windows/input_placeholders.py2
-rw-r--r--poezio/windows/inputs.py10
-rw-r--r--poezio/windows/list.py2
-rw-r--r--poezio/windows/misc.py2
-rw-r--r--poezio/windows/muc.py6
-rw-r--r--poezio/windows/roster_win.py10
-rw-r--r--poezio/windows/text_win.py6
40 files changed, 192 insertions, 192 deletions
diff --git a/poezio/bookmarks.py b/poezio/bookmarks.py
index c7d26a51..749705e7 100644
--- a/poezio/bookmarks.py
+++ b/poezio/bookmarks.py
@@ -33,8 +33,8 @@ import logging
from slixmpp.plugins.xep_0048 import Bookmarks, Conference, URL
from slixmpp import JID
-from common import safeJID
-from config import config
+from . common import safeJID
+from . config import config
log = logging.getLogger(__name__)
diff --git a/poezio/common.py b/poezio/common.py
index 4c74a873..89814b8e 100644
--- a/poezio/common.py
+++ b/poezio/common.py
@@ -11,7 +11,7 @@ Various useful functions.
from datetime import datetime, timedelta
from slixmpp import JID, InvalidJID
-from poezio_shlex import shlex
+from . poezio_shlex import shlex
import base64
import os
diff --git a/poezio/config.py b/poezio/config.py
index ef622f53..650202e5 100644
--- a/poezio/config.py
+++ b/poezio/config.py
@@ -21,7 +21,7 @@ import pkg_resources
from configparser import RawConfigParser, NoOptionError, NoSectionError
from os import environ, makedirs, path, remove
from shutil import copy2
-from args import parse_args
+from . args import parse_args
DEFAULT_CONFIG = {
'Poezio': {
@@ -642,7 +642,7 @@ def setup_logging():
def post_logging_setup():
# common imports slixmpp, which creates then its loggers, so
# it needs to be after logger configuration
- from common import safeJID as JID
+ from . common import safeJID as JID
global safeJID
safeJID = JID
diff --git a/poezio/connection.py b/poezio/connection.py
index 1803b812..460acd73 100644
--- a/poezio/connection.py
+++ b/poezio/connection.py
@@ -20,10 +20,10 @@ import sys
import slixmpp
from slixmpp.plugins.xep_0184 import XEP_0184
-import common
-import fixes
-from common import safeJID
-from config import config, options
+from . import common
+from . import fixes
+from . common import safeJID
+from . config import config, options
class Connection(slixmpp.ClientXMPP):
"""
diff --git a/poezio/contact.py b/poezio/contact.py
index c670e5bc..7a6d231a 100644
--- a/poezio/contact.py
+++ b/poezio/contact.py
@@ -13,7 +13,7 @@ the roster.
import logging
log = logging.getLogger(__name__)
-from common import safeJID
+from . common import safeJID
from collections import defaultdict
class Resource(object):
diff --git a/poezio/core/commands.py b/poezio/core/commands.py
index a3bbcb42..789528d5 100644
--- a/poezio/core/commands.py
+++ b/poezio/core/commands.py
@@ -14,18 +14,18 @@ from slixmpp.xmlstream.stanzabase import StanzaBase
from slixmpp.xmlstream.handler import Callback
from slixmpp.xmlstream.matcher import StanzaPath
-import common
-import fixes
-import pep
-import tabs
-from bookmarks import Bookmark
-from common import safeJID
-from config import config, DEFAULT_CONFIG, options as config_opts
-import multiuserchat as muc
-from plugin import PluginConfig
-from roster import roster
-from theming import dump_tuple, get_theme
-from decorators import command_args_parser
+from .. import common
+from .. import fixes
+from .. import pep
+from .. import tabs
+from .. bookmarks import Bookmark
+from .. common import safeJID
+from .. config import config, DEFAULT_CONFIG, options as config_opts
+from .. import multiuserchat as muc
+from .. plugin import PluginConfig
+from .. roster import roster
+from .. theming import dump_tuple, get_theme
+from .. decorators import command_args_parser
from . structs import Command, POSSIBLE_SHOW
diff --git a/poezio/core/completions.py b/poezio/core/completions.py
index 9b64cd48..66f532d5 100644
--- a/poezio/core/completions.py
+++ b/poezio/core/completions.py
@@ -8,12 +8,12 @@ log = logging.getLogger(__name__)
import os
from functools import reduce
-import common
-import pep
-import tabs
-from common import safeJID
-from config import config
-from roster import roster
+from .. import common
+from .. import pep
+from .. import tabs
+from .. common import safeJID
+from .. config import config
+from .. roster import roster
from . structs import POSSIBLE_SHOW
diff --git a/poezio/core/core.py b/poezio/core/core.py
index f5539d59..fec2c7e5 100644
--- a/poezio/core/core.py
+++ b/poezio/core/core.py
@@ -19,29 +19,29 @@ import time
from slixmpp.xmlstream.handler import Callback
-import connection
-import decorators
-import events
-import multiuserchat as muc
-import singleton
-import tabs
-import theming
-import timed_events
-import windows
-
-from bookmarks import BookmarkList
-from common import safeJID
-from config import config, firstrun
-from contact import Contact, Resource
-from daemon import Executor
-from fifo import Fifo
-from logger import logger
-from plugin_manager import PluginManager
-from roster import roster
-from size_manager import SizeManager
-from text_buffer import TextBuffer
-from theming import get_theme
-import keyboard
+from .. import connection
+from .. import decorators
+from .. import events
+from .. import multiuserchat as muc
+from .. import singleton
+from .. import tabs
+from .. import theming
+from .. import timed_events
+from .. import windows
+
+from .. bookmarks import BookmarkList
+from .. common import safeJID
+from .. config import config, firstrun
+from .. contact import Contact, Resource
+from .. daemon import Executor
+from .. fifo import Fifo
+from .. logger import logger
+from .. plugin_manager import PluginManager
+from .. roster import roster
+from .. size_manager import SizeManager
+from .. text_buffer import TextBuffer
+from .. theming import get_theme
+from .. import keyboard
from . completions import CompletionCore
from . commands import CommandCore
diff --git a/poezio/core/handlers.py b/poezio/core/handlers.py
index 395efc26..44736e1e 100644
--- a/poezio/core/handlers.py
+++ b/poezio/core/handlers.py
@@ -19,20 +19,20 @@ from slixmpp import InvalidJID
from slixmpp.xmlstream.stanzabase import StanzaBase, ElementBase
from xml.etree import ElementTree as ET
-import common
-import fixes
-import pep
-import tabs
-import windows
-import xhtml
-import multiuserchat as muc
-from common import safeJID
-from config import config, CACHE_DIR
-from contact import Resource
-from logger import logger
-from roster import roster
-from text_buffer import CorrectionError, AckError
-from theming import dump_tuple, get_theme
+from .. import common
+from .. import fixes
+from .. import pep
+from .. import tabs
+from .. import windows
+from .. import xhtml
+from .. import multiuserchat as muc
+from .. common import safeJID
+from .. config import config, CACHE_DIR
+from .. contact import Resource
+from .. logger import logger
+from .. roster import roster
+from .. text_buffer import CorrectionError, AckError
+from .. theming import dump_tuple, get_theme
from . commands import dumb_callback
diff --git a/poezio/decorators.py b/poezio/decorators.py
index c4ea6563..e72ffe80 100644
--- a/poezio/decorators.py
+++ b/poezio/decorators.py
@@ -2,7 +2,7 @@
Module containing various decorators
"""
-import common
+from . import common
class RefreshWrapper(object):
def __init__(self):
diff --git a/poezio/logger.py b/poezio/logger.py
index 91059028..fba30df7 100644
--- a/poezio/logger.py
+++ b/poezio/logger.py
@@ -16,16 +16,16 @@ import re
from os import makedirs
from datetime import datetime
-import common
-from config import config
-from xhtml import clean_text
-from theming import dump_tuple, get_theme
+from . import common
+from . config import config
+from . xhtml import clean_text
+from . theming import dump_tuple, get_theme
import logging
log = logging.getLogger(__name__)
-from config import LOG_DIR as log_dir
+from . config import LOG_DIR as log_dir
message_log_re = re.compile(r'MR (\d{4})(\d{2})(\d{2})T'
r'(\d{2}):(\d{2}):(\d{2})Z '
diff --git a/poezio/multiuserchat.py b/poezio/multiuserchat.py
index b7b12305..fc57cccb 100644
--- a/poezio/multiuserchat.py
+++ b/poezio/multiuserchat.py
@@ -13,7 +13,7 @@ slix plugin
from xml.etree import cElementTree as ET
-from common import safeJID
+from . common import safeJID
import logging
log = logging.getLogger(__name__)
diff --git a/poezio/plugin.py b/poezio/plugin.py
index bf30c981..df2fa6ee 100644
--- a/poezio/plugin.py
+++ b/poezio/plugin.py
@@ -6,8 +6,8 @@ These are used in the plugin system added in poezio 0.7.5
import os
from functools import partial
from configparser import RawConfigParser
-from timed_events import TimedEvent, DelayedEvent
-import config
+from . timed_events import TimedEvent, DelayedEvent
+from . import config
import inspect
import traceback
import logging
diff --git a/poezio/plugin_manager.py b/poezio/plugin_manager.py
index d7097de0..ee587816 100644
--- a/poezio/plugin_manager.py
+++ b/poezio/plugin_manager.py
@@ -9,10 +9,10 @@ import os
from os import path
import logging
-import core
-import tabs
-from plugin import PluginAPI
-from config import config
+from . import core
+from . import tabs
+from . plugin import PluginAPI
+from . config import config
log = logging.getLogger(__name__)
@@ -375,7 +375,7 @@ class PluginManager(object):
self.load_path.append(self.plugins_dir)
try:
- import poezio_plugins
+ from . import poezio_plugins
except:
pass
else:
diff --git a/poezio/poezio.py b/poezio/poezio.py
index 361daa91..cf66826a 100644
--- a/poezio/poezio.py
+++ b/poezio/poezio.py
@@ -17,7 +17,7 @@ import logging
sys.path.append(os.path.dirname(os.path.abspath(__file__)))
-import singleton
+from . import singleton
def test_curses():
"""
@@ -48,7 +48,7 @@ def main():
"""
sys.stdout.write("\x1b]0;poezio\x07")
sys.stdout.flush()
- import config
+ from . import config
config_path = config.check_create_config_dir()
config.run_cmdline_args(config_path)
config.create_global_config()
@@ -57,22 +57,22 @@ def main():
config.setup_logging()
config.post_logging_setup()
- from config import options
+ from . config import options
if options.check_config:
config.check_config()
sys.exit(0)
- import theming
+ from . import theming
theming.update_themes_dir()
- import logger
+ from . import logger
logger.create_logger()
- import roster
+ from . import roster
roster.create_roster()
- import core
+ from . import core
log = logging.getLogger('')
diff --git a/poezio/roster.py b/poezio/roster.py
index ba7da63e..17a55a2a 100644
--- a/poezio/roster.py
+++ b/poezio/roster.py
@@ -12,13 +12,13 @@ Defines the Roster and RosterGroup classes
import logging
log = logging.getLogger(__name__)
-from config import config
-from contact import Contact
-from roster_sorting import SORTING_METHODS, GROUP_SORTING_METHODS
+from . config import config
+from . contact import Contact
+from . roster_sorting import SORTING_METHODS, GROUP_SORTING_METHODS
from os import path as p
from datetime import datetime
-from common import safeJID
+from . common import safeJID
from slixmpp.exceptions import IqError, IqTimeout
diff --git a/poezio/tabs/basetabs.py b/poezio/tabs/basetabs.py
index 29da6fea..8a5c48ea 100644
--- a/poezio/tabs/basetabs.py
+++ b/poezio/tabs/basetabs.py
@@ -16,24 +16,24 @@ revolving around chats.
import logging
log = logging.getLogger(__name__)
-import singleton
+from .. import singleton
import string
import time
import weakref
from datetime import datetime, timedelta
from xml.etree import cElementTree as ET
-import core
-import timed_events
-import windows
-import xhtml
-from common import safeJID
-from config import config
-from decorators import refresh_wrapper
-from logger import logger
-from text_buffer import TextBuffer
-from theming import get_theme, dump_tuple
-from decorators import command_args_parser
+from .. import core
+from .. import timed_events
+from .. import windows
+from .. import xhtml
+from .. common import safeJID
+from .. config import config
+from .. decorators import refresh_wrapper
+from .. logger import logger
+from .. text_buffer import TextBuffer
+from .. theming import get_theme, dump_tuple
+from .. decorators import command_args_parser
# getters for tab colors (lambdas, so that they are dynamic)
STATE_COLORS = {
diff --git a/poezio/tabs/bookmarkstab.py b/poezio/tabs/bookmarkstab.py
index 7f5069ea..181a3794 100644
--- a/poezio/tabs/bookmarkstab.py
+++ b/poezio/tabs/bookmarkstab.py
@@ -5,10 +5,10 @@ Defines the data-forms Tab
import logging
log = logging.getLogger(__name__)
-import windows
-from bookmarks import Bookmark, BookmarkList, stanza_storage
-from tabs import Tab
-from common import safeJID
+from .. import windows
+from .. bookmarks import Bookmark, BookmarkList, stanza_storage
+from .. tabs import Tab
+from .. common import safeJID
class BookmarksTab(Tab):
diff --git a/poezio/tabs/conversationtab.py b/poezio/tabs/conversationtab.py
index 5451520f..8bd50e6b 100644
--- a/poezio/tabs/conversationtab.py
+++ b/poezio/tabs/conversationtab.py
@@ -18,16 +18,16 @@ import curses
from . basetabs import OneToOneTab, Tab
-import common
-import fixes
-import windows
-import xhtml
-from common import safeJID
-from config import config
-from decorators import refresh_wrapper
-from roster import roster
-from theming import get_theme, dump_tuple
-from decorators import command_args_parser
+from .. import common
+from .. import fixes
+from .. import windows
+from .. import xhtml
+from .. common import safeJID
+from .. config import config
+from .. decorators import refresh_wrapper
+from .. roster import roster
+from .. theming import get_theme, dump_tuple
+from .. decorators import command_args_parser
class ConversationTab(OneToOneTab):
"""
diff --git a/poezio/tabs/data_forms.py b/poezio/tabs/data_forms.py
index 0fad2974..59994890 100644
--- a/poezio/tabs/data_forms.py
+++ b/poezio/tabs/data_forms.py
@@ -5,8 +5,8 @@ Defines the data-forms Tab
import logging
log = logging.getLogger(__name__)
-import windows
-from tabs import Tab
+from .. import windows
+from .. tabs import Tab
class DataFormsTab(Tab):
"""
diff --git a/poezio/tabs/listtab.py b/poezio/tabs/listtab.py
index 4d8bab9c..364b3d44 100644
--- a/poezio/tabs/listtab.py
+++ b/poezio/tabs/listtab.py
@@ -10,9 +10,9 @@ log = logging.getLogger(__name__)
import curses
import collections
-import windows
-from common import safeJID
-from decorators import refresh_wrapper
+from .. import windows
+from .. common import safeJID
+from .. decorators import refresh_wrapper
from . import Tab
diff --git a/poezio/tabs/muctab.py b/poezio/tabs/muctab.py
index 20196c6f..47ae8a18 100644
--- a/poezio/tabs/muctab.py
+++ b/poezio/tabs/muctab.py
@@ -19,19 +19,19 @@ from datetime import datetime
from . import ChatTab, Tab
-import common
-import fixes
-import multiuserchat as muc
-import timed_events
-import windows
-import xhtml
-from common import safeJID
-from config import config
-from decorators import refresh_wrapper, command_args_parser
-from logger import logger
-from roster import roster
-from theming import get_theme, dump_tuple
-from user import User
+from .. import common
+from .. import fixes
+from .. import multiuserchat as muc
+from .. import timed_events
+from .. import windows
+from .. import xhtml
+from .. common import safeJID
+from .. config import config
+from .. decorators import refresh_wrapper, command_args_parser
+from .. logger import logger
+from .. roster import roster
+from .. theming import get_theme, dump_tuple
+from .. user import User
SHOW_NAME = {
diff --git a/poezio/tabs/privatetab.py b/poezio/tabs/privatetab.py
index e12f9fde..5013e30d 100644
--- a/poezio/tabs/privatetab.py
+++ b/poezio/tabs/privatetab.py
@@ -17,15 +17,15 @@ import curses
from . import OneToOneTab, MucTab, Tab
-import fixes
-import windows
-import xhtml
-from common import safeJID
-from config import config
-from decorators import refresh_wrapper
-from logger import logger
-from theming import get_theme, dump_tuple
-from decorators import command_args_parser
+from .. import fixes
+from .. import windows
+from .. import xhtml
+from .. common import safeJID
+from .. config import config
+from .. decorators import refresh_wrapper
+from .. logger import logger
+from .. theming import get_theme, dump_tuple
+from .. decorators import command_args_parser
class PrivateTab(OneToOneTab):
"""
diff --git a/poezio/tabs/rostertab.py b/poezio/tabs/rostertab.py
index f628d055..6fa737a2 100644
--- a/poezio/tabs/rostertab.py
+++ b/poezio/tabs/rostertab.py
@@ -18,15 +18,15 @@ from functools import partial
from . import Tab
-import common
-import windows
-from common import safeJID
-from config import config
-from contact import Contact, Resource
-from decorators import refresh_wrapper
-from roster import RosterGroup, roster
-from theming import get_theme, dump_tuple
-from decorators import command_args_parser
+from .. import common
+from .. import windows
+from .. common import safeJID
+from .. config import config
+from .. contact import Contact, Resource
+from .. decorators import refresh_wrapper
+from .. roster import RosterGroup, roster
+from .. theming import get_theme, dump_tuple
+from .. decorators import command_args_parser
class RosterInfoTab(Tab):
"""
diff --git a/poezio/tabs/xmltab.py b/poezio/tabs/xmltab.py
index 3df32fbe..29e2f2a7 100644
--- a/poezio/tabs/xmltab.py
+++ b/poezio/tabs/xmltab.py
@@ -17,11 +17,11 @@ from xml.etree import ElementTree as ET
from . import Tab
-import text_buffer
-import windows
-from xhtml import clean_text
-from decorators import command_args_parser, refresh_wrapper
-from common import safeJID
+from .. import text_buffer
+from .. import windows
+from .. xhtml import clean_text
+from .. decorators import command_args_parser, refresh_wrapper
+from .. common import safeJID
class MatchJID(object):
diff --git a/poezio/text_buffer.py b/poezio/text_buffer.py
index 5b97b198..56832270 100644
--- a/poezio/text_buffer.py
+++ b/poezio/text_buffer.py
@@ -12,8 +12,8 @@ import logging
log = logging.getLogger(__name__)
from datetime import datetime
-from config import config
-from theming import get_theme, dump_tuple
+from . config import config
+from . theming import get_theme, dump_tuple
class Message:
__slots__ = ('txt', 'nick_color', 'time', 'str_time', 'nickname', 'user',
diff --git a/poezio/theming.py b/poezio/theming.py
index b420c233..6d7eb477 100755
--- a/poezio/theming.py
+++ b/poezio/theming.py
@@ -66,7 +66,7 @@ It is used for example to define color gradient, etc.
import logging
log = logging.getLogger(__name__)
-from config import config
+from . config import config
import curses
import os
diff --git a/poezio/user.py b/poezio/user.py
index 4142869b..5509ec8a 100644
--- a/poezio/user.py
+++ b/poezio/user.py
@@ -13,9 +13,9 @@ An user is a MUC participant, not a roster contact (see contact.py)
from random import choice
from datetime import timedelta, datetime
from hashlib import md5
-import xhtml
+from . import xhtml
-from theming import get_theme
+from . theming import get_theme
import logging
log = logging.getLogger(__name__)
diff --git a/poezio/windows/base_wins.py b/poezio/windows/base_wins.py
index 1a578350..613e2e3d 100644
--- a/poezio/windows/base_wins.py
+++ b/poezio/windows/base_wins.py
@@ -14,9 +14,9 @@ import collections
import curses
import string
-import core
-import singleton
-from theming import to_curses_attr, read_tuple
+from .. import core
+from .. import singleton
+from .. 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 de1043c9..f7d72f78 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 .. theming import to_curses_attr, get_theme
+from .. 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 410648ec..c02296e5 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 .. 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 4790a76f..be9f1f0c 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 .. config import config
from . import Win
-from theming import get_theme, to_curses_attr
+from .. 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 f6aebd35..327f9b2b 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 .. common import safeJID
+from .. config import config
from . import Win
from . funcs import truncate_nick
-from theming import get_theme, to_curses_attr
+from .. 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 496417d1..92be4ffa 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 .. theming import get_theme, to_curses_attr
class HelpText(Win):
diff --git a/poezio/windows/inputs.py b/poezio/windows/inputs.py
index f204f1cb..c204b503 100644
--- a/poezio/windows/inputs.py
+++ b/poezio/windows/inputs.py
@@ -8,14 +8,14 @@ log = logging.getLogger(__name__)
import curses
import string
-import keyboard
-import common
-import poopt
+from .. import keyboard
+from .. import common
+from .. 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 .. config import config
+from .. theming import to_curses_attr
class Input(Win):
diff --git a/poezio/windows/list.py b/poezio/windows/list.py
index 677df6ff..d4458b5b 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 .. theming import to_curses_attr, get_theme
class ListWin(Win):
diff --git a/poezio/windows/misc.py b/poezio/windows/misc.py
index 07c91bbd..bc77fefd 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 .. theming import get_theme, to_curses_attr
class VerticalSeparator(Win):
"""
diff --git a/poezio/windows/muc.py b/poezio/windows/muc.py
index 84775787..4a0eb626 100644
--- a/poezio/windows/muc.py
+++ b/poezio/windows/muc.py
@@ -9,9 +9,9 @@ import curses
from . import Win
-import poopt
-from config import config
-from theming import to_curses_attr, get_theme
+from .. import poopt
+from .. config import config
+from .. 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 f024fae5..e1c92073 100644
--- a/poezio/windows/roster_win.py
+++ b/poezio/windows/roster_win.py
@@ -9,11 +9,11 @@ from datetime import datetime
from . import Win
-import common
-from config import config
-from contact import Contact, Resource
-from roster import RosterGroup
-from theming import get_theme, to_curses_attr
+from .. import common
+from .. config import config
+from .. contact import Contact, Resource
+from .. roster import RosterGroup
+from .. 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 5c644c46..1aad172c 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
-import poopt
-from config import config
-from theming import to_curses_attr, get_theme, dump_tuple
+from .. import poopt
+from .. config import config
+from .. theming import to_curses_attr, get_theme, dump_tuple
# msg is a reference to the corresponding Message object. text_start and