Commitd4020d8

committed

Convert path to str in FontManager.addpath

1 parent4a3c5d6 commitd4020d8Copy full SHA for d4020d8

File tree

-0

lines changed

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1091,6 +1091,8 @@ def addfont(self, path):`
`1091`	`1091`	`----------`
`1092`	`1092`	`path : str or path-like`
`1093`	`1093`	`"""`
	`1094`	`+path=str(path)# Convert to string in case of a path as`
	`1095`	`+# afmFontProperty and FT2Font expect this`
`1094`	`1096`	`ifPath(path).suffix.lower()==".afm":`
`1095`	`1097`	`withopen(path,"rb")asfh:`
`1096`	`1098`	`font=_afm.AFM(fh)`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,13 @@ def test_user_fonts_linux(tmpdir, monkeypatch):`
`176`	`176`	`_get_fontconfig_fonts.cache_clear()`
`177`	`177`
`178`	`178`
	`179`	`+deftest_addfont():`
	`180`	`+font_test_file='mpltest.ttf'`
	`181`	`+path=Path(__file__).parent/font_test_file`
	`182`	`+# Add font using Path, which should not produce an error. See #22582`
	`183`	`+fontManager.addfont(path)`
	`184`	`+`
	`185`	`+`
`179`	`186`	`@pytest.mark.skipif(sys.platform!='win32',reason='Windows only')`
`180`	`187`	`deftest_user_fonts_win32():`
`181`	`188`	`ifnot (os.environ.get('APPVEYOR')oros.environ.get('TF_BUILD')):`

Comments

(0)