Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit d1e4902

Browse filesBrowse files
committed
Merge remote-tracking branch 'upstream/v1.2.x'
2 parents 9ed1e4d + f2712d5 commit d1e4902
Copy full SHA for d1e4902

File tree

Expand file treeCollapse file tree

1 file changed

+7
-3
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+7
-3
lines changed

‎lib/matplotlib/font_manager.py

Copy file name to clipboardExpand all lines: lib/matplotlib/font_manager.py
+7-3Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ def get_size_in_points(self):
777777
return float(self._size)
778778
except ValueError:
779779
pass
780-
default_size = fontManager.get_default_size()
780+
default_size = FontManager.get_default_size()
781781
return default_size * font_scalings.get(self._size)
782782

783783
def get_file(self):
@@ -997,7 +997,10 @@ def __init__(self, size=None, weight='normal'):
997997
self.afmfiles = findSystemFonts(paths, fontext='afm') + \
998998
findSystemFonts(fontext='afm')
999999
self.afmlist = createFontList(self.afmfiles, fontext='afm')
1000-
self.defaultFont['afm'] = self.afmfiles[0]
1000+
if len(self.afmfiles):
1001+
self.defaultFont['afm'] = self.afmfiles[0]
1002+
else:
1003+
self.defaultFont['afm'] = None
10011004

10021005
self.ttf_lookup_cache = {}
10031006
self.afm_lookup_cache = {}
@@ -1008,7 +1011,8 @@ def get_default_weight(self):
10081011
"""
10091012
return self.__default_weight
10101013

1011-
def get_default_size(self):
1014+
@staticmethod
1015+
def get_default_size():
10121016
"""
10131017
Return the default font size.
10141018
"""

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.