Remove kodi_six: import directly

jellyfin · Jun 11, 2024 · cd53329 · cd53329
1 parent 8cabd4e
commit cd53329
Show file tree

Hide file tree

Showing 26 changed files with 51 additions and 26 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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