NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.3k

Commitfef412e

committed

Merge pull request#5021 from jkseppan/json-font-cache

Use json for the font cache instead of pickle

2 parentsd9bd62b +3008a7a commitfef412eCopy full SHA for fef412e

File tree

2 files changed

+57

-23

lines changed

lib/matplotlib
- font_manager.py
- tests
  - test_font_manager.py

2 files changed

+57

-23

lines changed

`‎lib/matplotlib/font_manager.py`

Lines changed: 39 additions & 22 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@`
`23`	`23`	`unicode_literals)`
`24`	`24`
`25`	`25`	`frommatplotlib.externalsimportsix`
`26`		`-frommatplotlib.externals.six.movesimportcPickleaspickle`
`27`	`26`
`28`	`27`	`"""`
`29`	`28`	`KNOWN ISSUES`
`@@ -47,6 +46,7 @@`
`47`	`46`	`see license/LICENSE_TTFQUERY.`
`48`	`47`	`"""`
`49`	`48`
	`49`	`+importjson`
`50`	`50`	`importos,sys,warnings`
`51`	`51`	`try:`
`52`	`52`	`set`
`@@ -947,23 +947,43 @@ def ttfdict_to_fnames(d):`
`947`	`947`	`fnames.append(fname)`
`948`	`948`	`returnfnames`
`949`	`949`
`950`		`-defpickle_dump(data,filename):`
`951`		`-"""`
`952`		`- Equivalent to pickle.dump(data, open(filename, 'w'))`
`953`		`- but closes the file to prevent filehandle leakage.`
`954`		`- """`
`955`		`-withopen(filename,'wb')asfh:`
`956`		`-pickle.dump(data,fh)`
	`950`	`+classJSONEncoder(json.JSONEncoder):`
	`951`	`+defdefault(self,o):`
	`952`	`+ifisinstance(o,FontManager):`
	`953`	`+returndict(o.__dict__,_class='FontManager')`
	`954`	`+elifisinstance(o,FontEntry):`
	`955`	`+returndict(o.__dict__,_class='FontEntry')`
	`956`	`+else:`
	`957`	`+returnsuper(JSONEncoder,self).default(o)`
	`958`	`+`
	`959`	`+def_json_decode(o):`
	`960`	`+cls=o.pop('_class',None)`
	`961`	`+ifclsisNone:`
	`962`	`+returno`
	`963`	`+elifcls=='FontManager':`
	`964`	`+r=FontManager.__new__(FontManager)`
	`965`	`+r.__dict__.update(o)`
	`966`	`+returnr`
	`967`	`+elifcls=='FontEntry':`
	`968`	`+r=FontEntry.__new__(FontEntry)`
	`969`	`+r.__dict__.update(o)`
	`970`	`+returnr`
	`971`	`+else:`
	`972`	`+raiseValueError("don't know how to deserialize _class=%s"%cls)`
`957`	`973`
`958`		`-defpickle_load(filename):`
`959`		`-"""`
`960`		`- Equivalent to pickle.load(open(filename, 'r'))`
`961`		`- but closes the file to prevent filehandle leakage.`
`962`		`- """`
`963`		`-withopen(filename,'rb')asfh:`
`964`		`-data=pickle.load(fh)`
`965`		`-returndata`
	`974`	`+defjson_dump(data,filename):`
	`975`	`+"""Dumps a data structure as JSON in the named file.`
	`976`	`+ Handles FontManager and its fields."""`
	`977`	`+`
	`978`	`+withopen(filename,'w')asfh:`
	`979`	`+json.dump(data,fh,cls=JSONEncoder,indent=2)`
`966`	`980`
	`981`	`+defjson_load(filename):`
	`982`	`+"""Loads a data structure as JSON from the named file.`
	`983`	`+ Handles FontManager and its fields."""`
	`984`	`+`
	`985`	`+withopen(filename,'r')asfh:`
	`986`	`+returnjson.load(fh,object_hook=_json_decode)`
`967`	`987`
`968`	`988`	`classTempCache(object):`
`969`	`989`	`"""`
`@@ -1388,10 +1408,7 @@ def findfont(prop, fontext='ttf'):`
`1388`	`1408`	`ifnot'TRAVIS'inos.environ:`
`1389`	`1409`	`cachedir=get_cachedir()`
`1390`	`1410`	`ifcachedirisnotNone:`
`1391`		`-ifsix.PY3:`
`1392`		`-_fmcache=os.path.join(cachedir,'fontList.py3k.cache')`
`1393`		`-else:`
`1394`		`-_fmcache=os.path.join(cachedir,'fontList.cache')`
	`1411`	`+_fmcache=os.path.join(cachedir,'fontList.json')`
`1395`	`1412`
`1396`	`1413`	`fontManager=None`
`1397`	`1414`
`@@ -1404,12 +1421,12 @@ def _rebuild():`
`1404`	`1421`	`globalfontManager`
`1405`	`1422`	`fontManager=FontManager()`
`1406`	`1423`	`if_fmcache:`
`1407`		`-pickle_dump(fontManager,_fmcache)`
	`1424`	`+json_dump(fontManager,_fmcache)`
`1408`	`1425`	`verbose.report("generated new fontManager")`
`1409`	`1426`
`1410`	`1427`	`if_fmcache:`
`1411`	`1428`	`try:`
`1412`		`-fontManager=pickle_load(_fmcache)`
	`1429`	`+fontManager=json_load(_fmcache)`
`1413`	`1430`	`if (nothasattr(fontManager,'_version')or`
`1414`	`1431`	`fontManager._version!=FontManager.__version__):`
`1415`	`1432`	`_rebuild()`

`‎lib/matplotlib/tests/test_font_manager.py`

Lines changed: 18 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,11 @@`
`5`	`5`	`frommatplotlib.externalsimportsix`
`6`	`6`
`7`	`7`	`importos`
	`8`	`+importtempfile`
	`9`	`+importwarnings`
`8`	`10`
`9`		`-frommatplotlib.font_managerimportfindfont,FontProperties`
	`11`	`+frommatplotlib.font_managerimport (`
	`12`	`+findfont,FontProperties,fontManager,json_dump,json_load)`
`10`	`13`	`frommatplotlibimportrc_context`
`11`	`14`
`12`	`15`
`@@ -17,3 +20,17 @@ def test_font_priority():`
`17`	`20`	`font=findfont(`
`18`	`21`	`FontProperties(family=["sans-serif"]))`
`19`	`22`	`assert_equal(os.path.basename(font),'cmmi10.ttf')`
	`23`	`+`
	`24`	`+`
	`25`	`+deftest_json_serialization():`
	`26`	`+withtempfile.NamedTemporaryFile()astemp:`
	`27`	`+json_dump(fontManager,temp.name)`
	`28`	`+copy=json_load(temp.name)`
	`29`	`+withwarnings.catch_warnings():`
	`30`	`+warnings.filterwarnings('ignore','findfont: Font family.*not found')`
	`31`	`+forpropin ({'family':'STIXGeneral'},`
	`32`	`+ {'family':'Bitstream Vera Sans','weight':700},`
	`33`	`+ {'family':'no such font family'}):`
	`34`	`+fp=FontProperties(**prop)`
	`35`	`+assert_equal(fontManager.findfont(fp,rebuild_if_missing=False),`
	`36`	`+copy.findfont(fp,rebuild_if_missing=False))`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitfef412e

File tree

2 files changed

2 files changed

`‎lib/matplotlib/font_manager.py`

`‎lib/matplotlib/tests/test_font_manager.py`

0 commit comments