* [#318] Added {pydir}/share to data dirs.

eoyilmaz · Mar 9, 2024 · 2e4004f · 2e4004f
1 parent b5d6c25
commit 2e4004f
Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/DisplayCAL/config.py b/DisplayCAL/config.py
@@ -91,6 +91,8 @@
     os.path.join(os.path.dirname(os.path.dirname(pypath)), "share", "DisplayCAL"),
     # venv/lib/python3.x/site-packages/DisplayCAL
     pydir,
+    # venv/share
+    os.path.join(os.path.dirname(pydir), "share"),
     # venv/lib/python3.x/site-packages/DisplayCAL-*.egg/share/DisplayCAL
     os.path.join(os.path.dirname(pydir), "share", "DisplayCAL"),
 ]

diff --git a/DisplayCAL/localization.py b/DisplayCAL/localization.py
@@ -37,7 +37,7 @@ def init(set_wx_locale=False):
         handle_error(
             UserWarning(
                 "Warning: No language files found. The "
-                "following places have been searched:\n%s" % "\n".join(langdirs)
+                "following places have been searched:\n{}".format("\n".join(langdirs))
             )
         )
 

diff --git a/VERSION_BASE b/VERSION_BASE
@@ -1 +1 @@
-3.9.11
+3.9.12
diff --git a/tests/data/display_data.py b/tests/data/display_data.py
@@ -1,8 +1,6 @@
 """Sample DisplayData class."""
 from typing import Dict, List
 
-from wx import Rect
-
 
 class DisplayData:
     """Sample Display."""
@@ -287,8 +285,9 @@ class DisplayData:
     ]
 
     @property
-    def Geometry(self) -> Rect:
+    def Geometry(self):
         """Return a wx Rect as display geometry."""
+        from wx import Rect
         return Rect(
             self.DISPLAY_DATA_1["pos"][0],
             self.DISPLAY_DATA_1["pos"][1],