Skip to content

Commit eb2a20d

Browse files
author
Raf Pauwels
committed
Replace distutils with packaging
`distutils` was removed from Python 3.12. Its use can be replaced with `packaging`
1 parent 8990d30 commit eb2a20d

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

resources/lib/commands/misc_commands.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323

2424
from xml.etree import cElementTree as ET
2525
from xml.dom import minidom
26-
from distutils.version import LooseVersion
2726

2827
from akl.utils import kodi, io
2928
from akl import constants
3029

30+
from resources.lib.packaging.version import Version as LooseVersion
3131
from resources.lib.commands.mediator import AppMediator
3232
from resources.lib import globals
3333
from resources.lib.repositories import UnitOfWork, AklAddonRepository, CategoryRepository, ROMCollectionRepository, XmlConfigurationRepository, SourcesRepository

resources/lib/repositories.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import json
66
import datetime
7-
from distutils.version import LooseVersion
87

98
import sqlite3
109
from sqlite3.dbapi2 import Cursor
@@ -18,6 +17,7 @@
1817
from resources.lib.domain import Asset, AssetPath, AssetMapping, RomAssetMapping
1918
from resources.lib.domain import VirtualCategoryFactory, VirtualCollectionFactory, ROMLauncherAddonFactory, g_assetFactory
2019
from resources.lib.domain import Source, ROMLauncherAddon, AklAddon
20+
from resources.lib.packaging.version import Version as LooseVersion
2121

2222

2323
# #################################################################################################

resources/lib/services.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import json
55

66
from datetime import datetime
7-
from distutils.version import LooseVersion
87

98
import xbmc
109

1110
from resources.lib import globals
11+
from resources.lib.packaging.version import Version as LooseVersion
1212
from resources.lib.repositories import UnitOfWork
1313
from resources.lib.webservice import WebService
1414
from resources.lib.commands.mediator import AppMediator

tests/services_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from unittest.mock import MagicMock, patch
55

66
import logging
7-
from distutils.version import LooseVersion
87

98
import tests.fake_routing
109
from tests.fakes import FakeFile, FakeUnitOfWork
@@ -16,6 +15,7 @@
1615
from resources.lib import globals
1716
from resources.lib.services import AppService
1817
from resources.lib.repositories import UnitOfWork
18+
from resources.lib.packaging.version import Version as LooseVersion
1919

2020
logger = logging.getLogger(__name__)
2121
logging.basicConfig(format = '%(asctime)s %(module)s %(levelname)s: %(message)s',

0 commit comments

Comments
 (0)