hashing of FontProperties accounts current rcParams

leejjoon · leejjoon · commit 2a9b39d7ca47 · 2009-03-05T04:45:00.000Z
svn path=/trunk/matplotlib/; revision=6956
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2009-02-28 hashing of FontProperties accounts current rcParams - JJL
+
 2009-02-28 Prevent double-rendering of shared axis in twinx, twiny - EF
 
 2009-02-26 Add optional bbox_to_anchor argument for legend class - JJL
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -705,10 +705,9 @@ def _parse_fontconfig_pattern(self, pattern):
         return parse_fontconfig_pattern(pattern)
 
     def __hash__(self):
-        l = self.__dict__.items()
-        l.sort()
+        l = [(k, getattr(self, "get" + k)()) for k in sorted(self.__dict__)]
         return hash(repr(l))
-
+ 
     def __str__(self):
         return self.get_fontconfig_pattern()
 
@@ -1181,7 +1180,7 @@ def findfont(self, prop, fontext='ttf'):
         """
         debug = False
         if prop is None:
-            return self.defaultFont
+            prop = FontProperties()
         if is_string_like(prop):
             prop = FontProperties(prop)
         fname = prop.get_file()

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2009-02-28 hashing of FontProperties accounts current rcParams - JJL`
	`2`	`+`
`1`	`3`	`2009-02-28 Prevent double-rendering of shared axis in twinx, twiny - EF`
`2`	`4`
`3`	`5`	`2009-02-26 Add optional bbox_to_anchor argument for legend class - JJL`