Commit286e53b

authored

Merge pull request#28498 from K900/main

Don't fail if we can't query system fonts on macOS

2 parents99f4a91 +24f2970 commit286e53bCopy full SHA for 286e53b

File tree

-2

lines changed

-2

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -266,8 +266,11 @@ def _get_fontconfig_fonts():`
`266`	`266`	`@lru_cache`
`267`	`267`	`def_get_macos_fonts():`
`268`	`268`	"""Cache and list the font paths known to ``system_profiler SPFontsDataType``."""
`269`		`-d,=plistlib.loads(`
`270`		`-subprocess.check_output(["system_profiler","-xml","SPFontsDataType"]))`
	`269`	`+try:`
	`270`	`+d,=plistlib.loads(`
	`271`	`+subprocess.check_output(["system_profiler","-xml","SPFontsDataType"]))`
	`272`	`+except (OSError,subprocess.CalledProcessError,plistlib.InvalidFileException):`
	`273`	`+return []`
`271`	`274`	`return [Path(entry["path"])forentryind["_items"]]`
`272`	`275`
`273`	`276`

Comments

(0)