From 7e033857bacb1681427377d551890e96de988b48 Mon Sep 17 00:00:00 2001
From: Timmy Welch <timmy@narnian.us>
Date: Fri, 10 Jun 2022 16:18:58 -0700
Subject: [PATCH] Replace pkg_resources with importlib.metadata

---
 comictaggerlib/main.py              |  7 +++----
 comictaggerlib/ui/settingswindow.ui | 14 +++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/comictaggerlib/main.py b/comictaggerlib/main.py
index 35d8f5a..517e1b7 100755
--- a/comictaggerlib/main.py
+++ b/comictaggerlib/main.py
@@ -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()
diff --git a/comictaggerlib/ui/settingswindow.ui b/comictaggerlib/ui/settingswindow.ui
index 6f5f03b..2f61133 100644
--- a/comictaggerlib/ui/settingswindow.ui
+++ b/comictaggerlib/ui/settingswindow.ui
@@ -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>