Fix font.size from being saved in the fontManager.cache

mdboom · mdboom · commit 07d119f5642e · 2007-09-20T12:31:26.000Z
svn path=/trunk/matplotlib/; revision=3861
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -773,6 +773,7 @@ def set_size(self, size):
         else:
             if is_string_like(size):
                 parent_size = fontManager.get_default_size()
+                print "parent_size", parent_size, size
                 scaling = font_scalings.get(size)
                 if scaling is not None:
                     size = parent_size * scaling
@@ -843,10 +844,9 @@ class FontManager:
     """
 
     def __init__(self, size=None, weight='normal'):
-        if not size : size = rcParams['font.size']
-        self.__default_size = size
         self.__default_weight = weight
-
+        self.default_size = size
+        
         paths = [os.path.join(rcParams['datapath'],'fonts','ttf'),
                  os.path.join(rcParams['datapath'],'fonts','afm')]
 
@@ -899,7 +899,9 @@ def get_default_weight(self):
 
     def get_default_size(self):
         "Return the default font size."
-        return self.__default_size
+        if self.default_size is None:
+            return rcParams['font.size']
+        return self.default_size
 
     def set_default_weight(self, weight):
         "Set the default font weight.  The initial value is 'normal'."
@@ -1085,6 +1087,7 @@ def _rebuild():
 
     try:
         fontManager = pickle_load(_fmcache)
+        fontManager.default_size = None
         verbose.report("Using fontManager instance from %s" % _fmcache)
     except:
         _rebuild()
