Skip to content

Commit

Permalink
Rearranged code
Browse files Browse the repository at this point in the history
  • Loading branch information
radarhere committed Jun 15, 2024
1 parent 8e6426f commit f62796d
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/PIL/ImageFont.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit f62796d

Please sign in to comment.