Merge pull request #2094 from mdboom/2to3-warnings-fix

mdboom · mdboom · commit 34e929652988 · 2013-05-30T17:52:06.000-07:00
Parsing errors when installing 1.3.0rc2
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -1261,9 +1261,8 @@ def setp(obj, *args, **kwargs):
     :func:`setp` works with the MATLAB style string/value pairs or
     with python kwargs.  For example, the following are equivalent::
 
-      >>> setp(lines, 'linewidth', 2, 'color', r')  # MATLAB style
-          ...
-      >>> setp(lines, linewidth=2, color='r')       # python style
+      >>> setp(lines, 'linewidth', 2, 'color', 'r')  # MATLAB style
+      >>> setp(lines, linewidth=2, color='r')        # python style
     """
 
     insp = ArtistInspector(obj)
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -3343,8 +3343,8 @@ def text(self, x, y, s, fontdict=None,
         text in the center of the axes::
 
             >>> text(0.5, 0.5,'matplotlib', horizontalalignment='center',
-            >>>      verticalalignment='center',
-            >>>      transform = ax.transAxes)
+            ...      verticalalignment='center',
+            ...      transform=ax.transAxes)
 
         You can put a rectangular box around the text instance (e.g., to
         set a background color) by using the keyword *bbox*.  *bbox* is
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -320,7 +320,7 @@ def restore_region(self, region, bbox=None, xy=None):
         >>> region = renderer.copy_from_bbox()
         >>> x1, y1, x2, y2 = region.get_extents()
         >>> renderer.restore_region(region, bbox=(x1+dx, y1, x2, y2),
-                                    xy=(x1-dx, y1))
+        ...                         xy=(x1-dx, y1))
 
         """
         if bbox is not None or xy is not None:
