walk back deprecation change

mbridak · Nov 16, 2023 · 6898276 · 6898276
1 parent f5abb86
commit 6898276
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -126,6 +126,7 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [23-11-15.1] Replacing the depricated function turned out to be a poor decision.
 - [23-11-15] Started working on Winter Field Day. (It doesn't work yet)
 - [23-11-14] Removed depricated pkgutil.get_loader, Lets see what breaks.
 - [23-11-13] Changed check_process() to only return True if python opened source file. Allows emacs to edit source file.

diff --git a/not1mm/__main__.py b/not1mm/__main__.py
@@ -11,7 +11,7 @@
 import logging
 import os
 
-# import pkgutil
+import pkgutil
 import platform
 import re
 import socket
@@ -62,9 +62,9 @@
 from not1mm.lib.versiontest import VersionTest
 
 # DeprecationWarning: 'pkgutil.get_loader' is deprecated and slated for removal in Python 3.14
-# loader = pkgutil.get_loader("not1mm")
-# WORKING_PATH = os.path.dirname(loader.get_filename())
-WORKING_PATH = os.path.dirname(__loader__.get_filename())
+loader = pkgutil.get_loader("not1mm")
+WORKING_PATH = os.path.dirname(loader.get_filename())
+# WORKING_PATH = os.path.dirname(__loader__.get_filename())
 
 DATA_PATH = os.environ.get("XDG_DATA_HOME", str(Path.home() / ".local" / "share"))
 DATA_PATH += "/not1mm"

diff --git a/not1mm/bandmap.py b/not1mm/bandmap.py
@@ -15,7 +15,7 @@
 import logging
 import os
 
-# import pkgutil
+import pkgutil
 import platform
 import sys
 import sqlite3
@@ -30,9 +30,9 @@
 UPDATE_INTERVAL = 2000
 
 # DeprecationWarning: 'pkgutil.get_loader' is deprecated and slated for removal in Python 3.14
-# loader = pkgutil.get_loader("not1mm")
-# WORKING_PATH = os.path.dirname(loader.get_filename())
-WORKING_PATH = os.path.dirname(__loader__.get_filename())
+loader = pkgutil.get_loader("not1mm")
+WORKING_PATH = os.path.dirname(loader.get_filename())
+# WORKING_PATH = os.path.dirname(__loader__.get_filename())
 
 if "XDG_DATA_HOME" in os.environ:
     DATA_PATH = os.environ.get("XDG_DATA_HOME")

diff --git a/not1mm/checkwindow.py b/not1mm/checkwindow.py
@@ -6,7 +6,7 @@
 
 import logging
 
-# import pkgutil
+import pkgutil
 import platform
 import queue
 import os
@@ -28,9 +28,9 @@
 os.environ["QT_QPA_PLATFORMTHEME"] = "gnome"
 
 # DeprecationWarning: 'pkgutil.get_loader' is deprecated and slated for removal in Python 3.14
-# loader = pkgutil.get_loader("not1mm")
-# WORKING_PATH = os.path.dirname(loader.get_filename())
-WORKING_PATH = os.path.dirname(__loader__.get_filename())
+loader = pkgutil.get_loader("not1mm")
+WORKING_PATH = os.path.dirname(loader.get_filename())
+# WORKING_PATH = os.path.dirname(__loader__.get_filename())
 
 if "XDG_DATA_HOME" in os.environ:
     DATA_PATH = os.environ.get("XDG_DATA_HOME")

diff --git a/not1mm/lib/version.py b/not1mm/lib/version.py
@@ -1,2 +1,2 @@
 """It's the version"""
-__version__ = "23.11.15"
+__version__ = "23.11.15.1"
diff --git a/not1mm/logwindow.py b/not1mm/logwindow.py
@@ -9,7 +9,7 @@
 import math
 import os
 
-# import pkgutil
+import pkgutil
 import platform
 import queue
 import sys
@@ -30,9 +30,9 @@
 os.environ["QT_QPA_PLATFORMTHEME"] = "gnome"
 
 # DeprecationWarning: 'pkgutil.get_loader' is deprecated and slated for removal in Python 3.14
-# loader = pkgutil.get_loader("not1mm")
-# WORKING_PATH = os.path.dirname(loader.get_filename())
-WORKING_PATH = os.path.dirname(__loader__.get_filename())
+loader = pkgutil.get_loader("not1mm")
+WORKING_PATH = os.path.dirname(loader.get_filename())
+# WORKING_PATH = os.path.dirname(__loader__.get_filename())
 
 if "XDG_DATA_HOME" in os.environ:
     DATA_PATH = os.environ.get("XDG_DATA_HOME")

diff --git a/not1mm/vfo.py b/not1mm/vfo.py
@@ -12,7 +12,7 @@
 
 import os
 
-# import pkgutil
+import pkgutil
 import platform
 import queue
 import sys
@@ -29,9 +29,9 @@
 os.environ["QT_QPA_PLATFORMTHEME"] = "gnome"
 
 # DeprecationWarning: 'pkgutil.get_loader' is deprecated and slated for removal in Python 3.14
-# loader = pkgutil.get_loader("not1mm")
-# WORKING_PATH = os.path.dirname(loader.get_filename())
-WORKING_PATH = os.path.dirname(__loader__.get_filename())
+loader = pkgutil.get_loader("not1mm")
+WORKING_PATH = os.path.dirname(loader.get_filename())
+# WORKING_PATH = os.path.dirname(__loader__.get_filename())
 
 if "XDG_DATA_HOME" in os.environ:
     DATA_PATH = os.environ.get("XDG_DATA_HOME")

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "not1mm" 
-version = "23.11.15"
+version = "23.11.15.1"
 description = "NOT1MM Logger"
 readme = "README.md"
 requires-python = ">=3.9"