chirp/share/__init__.py | 0 chirp/stock_configs/__init__.py | 0 chirp/wxui/__init__.py | 6 +++--- chirp/wxui/main.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chirp/share/__init__.py b/chirp/share/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/chirp/stock_configs/__init__.py b/chirp/stock_configs/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/chirp/wxui/__init__.py b/chirp/wxui/__init__.py index e2f9a6b2..090b14a7 100644 --- a/chirp/wxui/__init__.py +++ b/chirp/wxui/__init__.py @@ -4,9 +4,9 @@ import logging import os import sys -if sys.version_info < (3, 10): +try: import importlib_resources -else: +except ModuleNotFoundError: import importlib.resources as importlib_resources from chirp import directory @@ -127,7 +127,7 @@ def chirpmain(): else: lang = wx.Locale.GetSystemLanguage() - localedir = str(os.path.join(importlib_resources.files('chirp'), + localedir = str(os.path.join('/usr/share', 'locale')) app._lc = wx.Locale() if localedir and os.path.isdir(localedir): diff --git a/chirp/wxui/main.py b/chirp/wxui/main.py index a8712174..bea3b7c9 100644 --- a/chirp/wxui/main.py +++ b/chirp/wxui/main.py @@ -26,9 +26,9 @@ import tempfile import time import webbrowser -if sys.version_info < (3, 10): +try: import importlib_resources -else: +except ModuleNotFoundError: import importlib.resources as importlib_resources import wx