From 397d4577009c53e18bdc78173ee5811bcd0985df Mon Sep 17 00:00:00 2001 From: Tieqiong Zhang Date: Wed, 21 Aug 2024 22:02:42 -0400 Subject: [PATCH 1/2] fix not a package type error for importlib --- src/diffpy/pdfgui/gui/pdfguiglobals.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/diffpy/pdfgui/gui/pdfguiglobals.py b/src/diffpy/pdfgui/gui/pdfguiglobals.py index 7de59ed0..30261ac6 100644 --- a/src/diffpy/pdfgui/gui/pdfguiglobals.py +++ b/src/diffpy/pdfgui/gui/pdfguiglobals.py @@ -30,7 +30,11 @@ isAltered = False # Resolve APPDATADIR base path to application data files. -_mydir = os.path.abspath(str(files(__name__))) +try: + _mydir = os.path.abspath(str(files(__name__))) +except TypeError: # For Python < 3.12 + _mydir = os.path.abspath(os.path.dirname(__file__)) + _upbasedir = os.path.normpath(_mydir + "/../../..") _development_mode = os.path.basename(_upbasedir) == "src" and os.path.isfile( os.path.join(_upbasedir, "../pyproject.toml") From 36f37beab6b4e154efec56ccdc31e17d5fc104cf Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 02:06:26 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit hooks --- src/diffpy/pdfgui/gui/pdfguiglobals.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/diffpy/pdfgui/gui/pdfguiglobals.py b/src/diffpy/pdfgui/gui/pdfguiglobals.py index 30261ac6..cbfdc911 100644 --- a/src/diffpy/pdfgui/gui/pdfguiglobals.py +++ b/src/diffpy/pdfgui/gui/pdfguiglobals.py @@ -32,7 +32,7 @@ # Resolve APPDATADIR base path to application data files. try: _mydir = os.path.abspath(str(files(__name__))) -except TypeError: # For Python < 3.12 +except TypeError: # For Python < 3.12 _mydir = os.path.abspath(os.path.dirname(__file__)) _upbasedir = os.path.normpath(_mydir + "/../../..")