Merge pull request #1 from radarhere/improved-xdg-dirs-support

Rearranged code
REDxEYE · Jun 15, 2024 · d50c9cc · d50c9cc
2 parents 8e6426f + f62796d
commit d50c9cc
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py
@@ -848,13 +848,15 @@ def freetype(font: StrOrBytesPath | BinaryIO | None) -> FreeTypeFont:
                 # when XDG_DATA_HOME is unset or empty. This user-level directory
                 # takes precedence over system-level directories.
                 data_home = os.path.expanduser("~/.local/share")
-            dirs.append(os.path.join(data_home, "fonts"))
+            xdg_dirs = [data_home]
 
             data_dirs = os.environ.get("XDG_DATA_DIRS")
             if not data_dirs:
                 # Similarly, defaults are defined for the system-level directories
                 data_dirs = "/usr/local/share:/usr/share"
-            dirs += [os.path.join(ddir, "fonts") for ddir in data_dirs.split(":")]
+            xdg_dirs += data_dirs.split(":")
+
+            dirs += [os.path.join(xdg_dir, "fonts") for xdg_dir in xdg_dirs]
         elif sys.platform == "darwin":
             dirs += [
                 "/Library/Fonts",