lordwelch/comictagger
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace pkg_resources with importlib.metadata

Browse Source
This commit is contained in:
Timmy Welch 2022-06-10 16:18:58 -07:00
parent d9c02b0115
commit 7e033857ba
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
comictaggerlib/main.py
View File

@ -15,6 +15,7 @@
# limitations under the License.
from __future__ import annotations
import importlib.metadata
import json
import logging.handlers
import os
@ -25,8 +26,6 @@ import sys
import traceback
import types
import pkg_resources
from comicapi import utils
from comictaggerlib import cli
from comictaggerlib.comicvinetalker import ComicVineTalker
@ -155,8 +154,8 @@ def ctmain() -> None:
)
logger.debug("Installed Packages")
for pkg in sorted(pkg_resources.working_set, key=lambda x: x.project_name):
logger.debug("%s\t%s", pkg.project_name, pkg.version)
for pkg in sorted(importlib.metadata.distributions(), key=lambda x: x.name):
logger.debug("%s\t%s", pkg.name, pkg.version)
utils.load_publishers()
update_publishers()

14
comictaggerlib/ui/settingswindow.ui
View File

@ -30,7 +30,7 @@
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="tab">
<widget class="QWidget" name="tGeneral">
<attribute name="title">
<string>General</string>
</attribute>
@ -131,7 +131,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
<widget class="QWidget" name="tSearching">
<attribute name="title">
<string>Searching</string>
</attribute>
@ -225,7 +225,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_6">
<widget class="QWidget" name="tFilenameParser">
<attribute name="title">
<string>Filename Parser</string>
</attribute>
@ -279,7 +279,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_3">
<widget class="QWidget" name="tComicVine">
<attribute name="title">
<string>Comic Vine</string>
</attribute>
@ -471,7 +471,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_4">
<widget class="QWidget" name="tCBL">
<attribute name="title">
<string>CBL</string>
</attribute>
@ -582,7 +582,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_5">
<widget class="QWidget" name="tRename">
<attribute name="title">
<string>Rename</string>
</attribute>
@ -700,7 +700,7 @@ By default only removes restricted characters and filenames for the current Oper
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_7">
<widget class="QWidget" name="tRARTools">
<attribute name="title">
<string>RAR Tools</string>
</attribute>