diff --git a/not1mm/__main__.py b/not1mm/__main__.py index 0ffb35e7..4d3bf2b1 100644 --- 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 index cb046df0..6a3a4e49 100755 --- 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 index aafe4c15..244e4aaa 100644 --- 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/logwindow.py b/not1mm/logwindow.py index 328dae58..2017a2d5 100755 --- 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 index df7b6590..4292d5d7 100644 --- 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")