Inline the with_rasterized contextmanager.

anntzer · anntzer · commit f7ec3b170363 · 2017-08-30T14:57:24.000-07:00
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -4,7 +4,6 @@
 import six
 
 from collections import OrderedDict, namedtuple
-from contextlib import contextmanager
 from functools import wraps
 import inspect
 import re
@@ -43,30 +42,23 @@ def allow_rasterization(draw):
     other setup function calls, such as starting and flushing a mixed-mode
     renderer.
     """
-    @contextmanager
-    def with_rasterized(artist, renderer):
-
-        if artist.get_rasterized():
-            renderer.start_rasterizing()
-
-        if artist.get_agg_filter() is not None:
-            renderer.start_filter()
 
+    # the axes class has a second argument inframe for its draw method.
+    @wraps(draw)
+    def draw_wrapper(artist, renderer, *args, **kwargs):
         try:
-            yield
+            if artist.get_rasterized():
+                renderer.start_rasterizing()
+            if artist.get_agg_filter() is not None:
+                renderer.start_filter()
+
+            return draw(artist, renderer, *args, **kwargs)
         finally:
             if artist.get_agg_filter() is not None:
                 renderer.stop_filter(artist.get_agg_filter())
-
             if artist.get_rasterized():
                 renderer.stop_rasterizing()
 
-    # the axes class has a second argument inframe for its draw method.
-    @wraps(draw)
-    def draw_wrapper(artist, renderer, *args, **kwargs):
-        with with_rasterized(artist, renderer):
-            return draw(artist, renderer, *args, **kwargs)
-
     draw_wrapper._supports_rasterization = True
     return draw_wrapper
 
