diff --git a/jellyfin_kodi/client.py b/jellyfin_kodi/client.py index e38e52f7c..cf8c3315a 100644 --- a/jellyfin_kodi/client.py +++ b/jellyfin_kodi/client.py @@ -5,7 +5,9 @@ import os -from kodi_six import xbmc, xbmcaddon, xbmcvfs +import xbmc +import xbmcaddon +import xbmcvfs from .helper import translate, window, settings, addon_id, dialog, LazyLogger from .helper.utils import create_id, translate_path diff --git a/jellyfin_kodi/connect.py b/jellyfin_kodi/connect.py index 8a3f2b1db..6dac14502 100644 --- a/jellyfin_kodi/connect.py +++ b/jellyfin_kodi/connect.py @@ -3,7 +3,8 @@ ################################################################################################## -from kodi_six import xbmc, xbmcaddon +import xbmc +import xbmcaddon from . import client from .database import get_credentials, save_credentials diff --git a/jellyfin_kodi/database/__init__.py b/jellyfin_kodi/database/__init__.py index c55cd6dac..d90f9607c 100644 --- a/jellyfin_kodi/database/__init__.py +++ b/jellyfin_kodi/database/__init__.py @@ -10,7 +10,8 @@ import sys import re -from kodi_six import xbmc, xbmcvfs +import xbmc +import xbmcvfs from . import jellyfin_db from ..helper import translate, settings, window, dialog diff --git a/jellyfin_kodi/dialogs/context.py b/jellyfin_kodi/dialogs/context.py index a0d4c6c25..53ae909d9 100644 --- a/jellyfin_kodi/dialogs/context.py +++ b/jellyfin_kodi/dialogs/context.py @@ -5,7 +5,8 @@ import os -from kodi_six import xbmcgui, xbmcaddon +import xbmcgui +import xbmcaddon from ..helper import window, addon_id from ..helper import LazyLogger diff --git a/jellyfin_kodi/dialogs/loginmanual.py b/jellyfin_kodi/dialogs/loginmanual.py index d147cdade..61c89492c 100644 --- a/jellyfin_kodi/dialogs/loginmanual.py +++ b/jellyfin_kodi/dialogs/loginmanual.py @@ -3,7 +3,7 @@ ################################################################################################## -from kodi_six import xbmcgui +import xbmcgui from ..helper import translate, LazyLogger, kodi_version diff --git a/jellyfin_kodi/dialogs/resume.py b/jellyfin_kodi/dialogs/resume.py index 0357a413f..9f2cf3ed5 100644 --- a/jellyfin_kodi/dialogs/resume.py +++ b/jellyfin_kodi/dialogs/resume.py @@ -3,7 +3,8 @@ ################################################################################################## -from kodi_six import xbmc, xbmcgui +import xbmc +import xbmcgui from ..helper import LazyLogger diff --git a/jellyfin_kodi/dialogs/serverconnect.py b/jellyfin_kodi/dialogs/serverconnect.py index 9030edb89..b20b161f6 100644 --- a/jellyfin_kodi/dialogs/serverconnect.py +++ b/jellyfin_kodi/dialogs/serverconnect.py @@ -3,7 +3,8 @@ ################################################################################################## -from kodi_six import xbmc, xbmcgui +import xbmc +import xbmcgui from ..helper import translate from ..jellyfin.connection_manager import CONNECTION_STATE diff --git a/jellyfin_kodi/dialogs/servermanual.py b/jellyfin_kodi/dialogs/servermanual.py index 138edb875..eaaabc884 100644 --- a/jellyfin_kodi/dialogs/servermanual.py +++ b/jellyfin_kodi/dialogs/servermanual.py @@ -5,7 +5,7 @@ import re -from kodi_six import xbmcgui +import xbmcgui from ..helper import translate from ..jellyfin.connection_manager import CONNECTION_STATE diff --git a/jellyfin_kodi/dialogs/usersconnect.py b/jellyfin_kodi/dialogs/usersconnect.py index b6a4af521..6df02d711 100644 --- a/jellyfin_kodi/dialogs/usersconnect.py +++ b/jellyfin_kodi/dialogs/usersconnect.py @@ -3,7 +3,7 @@ ################################################################################################## -from kodi_six import xbmcgui +import xbmcgui from ..helper import LazyLogger from ..helper.utils import kodi_version diff --git a/jellyfin_kodi/entrypoint/context.py b/jellyfin_kodi/entrypoint/context.py index e5d383b8c..572fd7e03 100644 --- a/jellyfin_kodi/entrypoint/context.py +++ b/jellyfin_kodi/entrypoint/context.py @@ -6,7 +6,8 @@ import json import sys -from kodi_six import xbmc, xbmcaddon +import xbmc +import xbmcaddon from .. import database from ..dialogs import context diff --git a/jellyfin_kodi/entrypoint/default.py b/jellyfin_kodi/entrypoint/default.py index 32ab68ebd..e2868bb3d 100644 --- a/jellyfin_kodi/entrypoint/default.py +++ b/jellyfin_kodi/entrypoint/default.py @@ -8,7 +8,11 @@ import os from urllib.parse import parse_qsl, urlencode -from kodi_six import xbmc, xbmcvfs, xbmcgui, xbmcplugin, xbmcaddon +import xbmc +import xbmcvfs +import xbmcgui +import xbmcplugin +import xbmcaddon from .. import client from ..database import reset, get_sync, Database, jellyfin_db, get_credentials diff --git a/jellyfin_kodi/entrypoint/service.py b/jellyfin_kodi/entrypoint/service.py index 78019e5fc..e267571d9 100644 --- a/jellyfin_kodi/entrypoint/service.py +++ b/jellyfin_kodi/entrypoint/service.py @@ -10,7 +10,8 @@ # Workaround for threads using datetime: _striptime is locked import _strptime # noqa:F401 -from kodi_six import xbmc, xbmcgui +import xbmc +import xbmcgui from .. import objects from .. import connect diff --git a/jellyfin_kodi/full_sync.py b/jellyfin_kodi/full_sync.py index 6143e960a..36453ada5 100644 --- a/jellyfin_kodi/full_sync.py +++ b/jellyfin_kodi/full_sync.py @@ -6,7 +6,7 @@ from contextlib import contextmanager import datetime -from kodi_six import xbmc +import xbmc from . import downloader as server from .objects import Movies, TVShows, MusicVideos, Music diff --git a/jellyfin_kodi/helper/loghandler.py b/jellyfin_kodi/helper/loghandler.py index e4181ad1b..9e57f103e 100644 --- a/jellyfin_kodi/helper/loghandler.py +++ b/jellyfin_kodi/helper/loghandler.py @@ -7,7 +7,8 @@ import logging import traceback -from kodi_six import xbmc, xbmcaddon +import xbmc +import xbmcaddon from .. import database from . import settings, kodi_version diff --git a/jellyfin_kodi/helper/playutils.py b/jellyfin_kodi/helper/playutils.py index baec4b56e..614f79f0e 100644 --- a/jellyfin_kodi/helper/playutils.py +++ b/jellyfin_kodi/helper/playutils.py @@ -7,7 +7,8 @@ from uuid import uuid4 import requests -from kodi_six import xbmc, xbmcvfs +import xbmc +import xbmcvfs from .. import client from .utils import translate_path diff --git a/jellyfin_kodi/helper/translate.py b/jellyfin_kodi/helper/translate.py index 6844fe7c6..cd6dd037d 100644 --- a/jellyfin_kodi/helper/translate.py +++ b/jellyfin_kodi/helper/translate.py @@ -3,7 +3,8 @@ ################################################################################################## -from kodi_six import xbmc, xbmcaddon +import xbmc +import xbmcaddon from . import LazyLogger diff --git a/jellyfin_kodi/helper/utils.py b/jellyfin_kodi/helper/utils.py index e6e1be3eb..c7c31567a 100644 --- a/jellyfin_kodi/helper/utils.py +++ b/jellyfin_kodi/helper/utils.py @@ -14,7 +14,10 @@ from dateutil import tz, parser -from kodi_six import xbmc, xbmcaddon, xbmcgui, xbmcvfs +import xbmc +import xbmcaddon +import xbmcgui +import xbmcvfs from . import LazyLogger from .translate import translate diff --git a/jellyfin_kodi/helper/wrapper.py b/jellyfin_kodi/helper/wrapper.py index 73f19982d..b1cb41991 100644 --- a/jellyfin_kodi/helper/wrapper.py +++ b/jellyfin_kodi/helper/wrapper.py @@ -3,7 +3,7 @@ ################################################################################################# -from kodi_six import xbmcgui +import xbmcgui from . import LazyLogger diff --git a/jellyfin_kodi/helper/xmls.py b/jellyfin_kodi/helper/xmls.py index fdf9e3a9f..9c3fbb5fa 100644 --- a/jellyfin_kodi/helper/xmls.py +++ b/jellyfin_kodi/helper/xmls.py @@ -6,7 +6,8 @@ import os import xml.etree.ElementTree as etree -from kodi_six import xbmc, xbmcvfs +import xbmc +import xbmcvfs from .utils import translate_path from . import translate, dialog, settings, LazyLogger diff --git a/jellyfin_kodi/jellyfin/ws_client.py b/jellyfin_kodi/jellyfin/ws_client.py index 38a17f8b4..4c0d91bb7 100644 --- a/jellyfin_kodi/jellyfin/ws_client.py +++ b/jellyfin_kodi/jellyfin/ws_client.py @@ -7,7 +7,7 @@ import threading import time -from kodi_six import xbmc +import xbmc from ..helper import LazyLogger, settings diff --git a/jellyfin_kodi/library.py b/jellyfin_kodi/library.py index 5c1b5a90f..452429761 100644 --- a/jellyfin_kodi/library.py +++ b/jellyfin_kodi/library.py @@ -8,7 +8,8 @@ import queue -from kodi_six import xbmc, xbmcgui +import xbmc +import xbmcgui from .objects import Movies, TVShows, MusicVideos, Music from .objects.kodi import Movies as KodiDb diff --git a/jellyfin_kodi/monitor.py b/jellyfin_kodi/monitor.py index 4f02226bb..1123a5c88 100644 --- a/jellyfin_kodi/monitor.py +++ b/jellyfin_kodi/monitor.py @@ -7,7 +7,7 @@ import json import threading -from kodi_six import xbmc +import xbmc from . import connect from . import player diff --git a/jellyfin_kodi/objects/actions.py b/jellyfin_kodi/objects/actions.py index 4711e1e11..7b91038e7 100644 --- a/jellyfin_kodi/objects/actions.py +++ b/jellyfin_kodi/objects/actions.py @@ -8,7 +8,10 @@ import json from datetime import timedelta -from kodi_six import xbmc, xbmcgui, xbmcplugin, xbmcaddon +import xbmc +import xbmcgui +import xbmcplugin +import xbmcaddon from ..helper import translate, playutils, api, window, settings, dialog from ..dialogs import resume diff --git a/jellyfin_kodi/player.py b/jellyfin_kodi/player.py index ac7092082..a71122bf3 100644 --- a/jellyfin_kodi/player.py +++ b/jellyfin_kodi/player.py @@ -5,7 +5,8 @@ import os -from kodi_six import xbmc, xbmcvfs +import xbmc +import xbmcvfs from .objects.obj import Objects from .helper import translate, api, window, settings, dialog, event, JSONRPC diff --git a/jellyfin_kodi/views.py b/jellyfin_kodi/views.py index d13cec4c8..310be87f6 100644 --- a/jellyfin_kodi/views.py +++ b/jellyfin_kodi/views.py @@ -7,7 +7,7 @@ import xml.etree.ElementTree as etree from urllib.parse import urlencode -from kodi_six import xbmcvfs +import xbmcvfs from .database import Database, jellyfin_db, get_sync, save_sync from .helper import translate, api, window, event diff --git a/service.py b/service.py index c19472d5b..a28e27aa4 100644 --- a/service.py +++ b/service.py @@ -5,7 +5,7 @@ import threading -from kodi_six import xbmc +import xbmc from jellyfin_kodi.entrypoint.service import Service from jellyfin_kodi.helper.utils import settings