Merge remote-tracking branch 'ivanov/faster-image-comp' into faster_image_comparison_decorator

mdboom · mdboom · commit 43ffb29cf58a · 2011-04-28T12:47:25.000-04:00
Fix for Python 2.5 compatibility.
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -68,7 +68,7 @@ def test(self):
 def cleanup(func):
     name = func.__name__
     func = staticmethod(func)
-    func.__func__.__name__ = '_private'
+    func.__get__(1).__name__ = '_private'
     new_class = new.classobj(
         name,
         (CleanupTest,),
@@ -166,7 +166,7 @@ def compare_images_decorator(func):
         # well, outside of the context of our image comparison test
         # generator.
         func = staticmethod(func)
-        func.__func__.__name__ = '_private'
+        func.__get__(1).__name__ = '_private'
         new_class = new.classobj(
             name,
             (ImageComparisonTest,),
