Merge branch 'v1.0.x-maint'

leejjoon · leejjoon · commit a168bc4c854c · 2011-09-16T18:32:51.000+09:00
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -685,8 +685,14 @@ def _parse_fontconfig_pattern(self, pattern):
         return parse_fontconfig_pattern(pattern)
 
     def __hash__(self):
-        l = [(k, getattr(self, "get" + k)()) for k in sorted(self.__dict__)]
-        return hash(repr(l))
+        l = (tuple(self.get_family()),
+             self.get_slant(),
+             self.get_variant(),
+             self.get_weight(),
+             self.get_stretch(),
+             self.get_size_in_points(),
+             self.get_file())
+        return hash(l)
 
     def __str__(self):
         return self.get_fontconfig_pattern()
diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py
@@ -1618,6 +1618,7 @@ def save_offset(self):
 
         self.ox, self.oy = ox0, oy0
         self.annotation.textcoords = "figure pixels"
+        self.update_offset(0, 0)
 
     def update_offset(self, dx, dy):
         ann = self.annotation
