patch branch updates

jdh2358 · jdh2358 · commit 0024d970e979 · 2010-03-03T21:06:01.000Z
svn path=/trunk/matplotlib/; revision=8176
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,26 @@
+2010-03-03 Manually brought in commits from branch via diff/patch (svnmerge is broken)
+
+  ------------------------------------------------------------------------
+  r8175 | leejjoon | 2010-03-03 10:03:30 -0800 (Wed, 03 Mar 2010) | 1 line
+
+  fix arguments of allow_rasterization.draw_wrapper
+  ------------------------------------------------------------------------
+  r8174 | jdh2358 | 2010-03-03 09:15:58 -0800 (Wed, 03 Mar 2010) | 1 line
+
+  added support for favicon in docs build
+  ------------------------------------------------------------------------
+  r8173 | jdh2358 | 2010-03-03 08:56:16 -0800 (Wed, 03 Mar 2010) | 1 line
+
+  applied Mattias get_bounds patch
+  ------------------------------------------------------------------------
+  r8172 | jdh2358 | 2010-03-03 08:31:42 -0800 (Wed, 03 Mar 2010) | 1 line
+
+  fix svnmerge download instructions
+  ------------------------------------------------------------------------
+  r8171 | jdh2358 | 2010-03-03 07:47:48 -0800 (Wed, 03 Mar 2010) | 1 line
+
+
+
 2010-02-25 add annotation_demo3.py that demonstrates new functionality. -JJL
 
 2010-02-25 refactor Annotation to support arbitrary Transform as xycoords 
diff --git a/doc/_static/favicon.ico b/doc/_static/favicon.ico
diff --git a/doc/_templates/indexsidebar.html b/doc/_templates/indexsidebar.html
@@ -9,11 +9,11 @@ <h3>News</h3>
 pathto('users/installing') }}">installing</a>
 </p>
 
-<p>Sandro Tosi has a new book
-<a href="http://www.packtpub.com/matplotlib-python-development/book">Matplotlib for python
-developers</a>
-also
-at <a href="http://www.amazon.com/Matplotlib-Python-Developers-Sandro-Tosi/dp/1847197906">amazon</a>.</p>
+<p>Sandro Tosi has a new book 
+ <a href="http://www.packtpub.com/matplotlib-python-development/book?utm_source=matplotlib.sourceforge.net&utm_medium=link&utm_content=pod&utm_campaign=mdb_002124">Matplotlib for python
+  developers</a>
+  also
+  at <a href="http://www.amazon.com/Matplotlib-Python-Developers-Sandro-Tosi/dp/1847197906">amazon</a>.</p>
 
 <p>Build websites like matplotlib's,
 with <a href="http://sphinx.pocoo.org/">sphinx</a> and extensions for
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -23,7 +23,7 @@
 </script>
 <object><noscript><p><img src="http://apps.sourceforge.net/piwik/matplotlib/piwik.php?idsite=1" alt="piwik"/></p></noscript></object>
 <!-- End Piwik Tag -->
-
+<link rel="shortcut icon" href="_static/favicon.ico"> 
 
 <div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px">
 <a href="{{ pathto('index') }}"><img src="{{
diff --git a/doc/devel/coding_guide.rst b/doc/devel/coding_guide.rst
@@ -82,8 +82,8 @@ The basic procedure is:
 
 * install ``svnmerge.py`` in your PATH::
 
-    > wget http://svn.collab.net/repos/svn/trunk/contrib/client-side/\
-      svnmerge/svnmerge.py
+    > wget http://svn.apache.org/repos/asf/subversion/trunk/contrib/\
+      client-side/svnmerge/svnmerge.py
 
 * get a svn checkout of the branch you'll be making bugfixes to and
   the trunk (see above)
diff --git a/doc/users/artists.rst b/doc/users/artists.rst
@@ -419,7 +419,7 @@ interactive session illustrating what is going on:
     # and notice that the ax.add_patch method has set the axes
     # instance
     In [267]: print rect.get_axes()
-    Subplot(49,81.25)
+    Axes(0.125,0.1;0.775x0.8)
 
     # and the transformation has been set too
     In [268]: print rect.get_transform()
@@ -434,7 +434,7 @@ interactive session illustrating what is going on:
     (0.0, 1.0)
 
     # but the data limits have been updated to encompass the rectangle
-    In [271]: print ax.dataLim.get_bounds()
+    In [271]: print ax.dataLim.bounds
     (1.0, 1.0, 5.0, 12.0)
 
     # we can manually invoke the auto-scaling machinery
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -50,9 +50,9 @@ def after(artist, renderer):
             renderer.stop_rasterizing()
 
     # the axes class has a second argument inframe for its draw method.
-    def draw_wrapper(artist, renderer, *kl):
+    def draw_wrapper(artist, renderer, *args, **kwargs):
         before(artist, renderer)
-        draw(artist, renderer, *kl)
+        draw(artist, renderer, *args, **kwargs)
         after(artist, renderer)
 
     # "safe wrapping" to exactly replicate anything we haven't overridden above
diff --git a/lib/matplotlib/backends/backend_wxagg.py b/lib/matplotlib/backends/backend_wxagg.py
@@ -171,7 +171,7 @@ def _clipped_image_as_bitmap(image, bbox):
     """
     Convert the region of a wx.Image bounded by bbox to a wx.Bitmap.
     """
-    l, b, width, height = bbox.get_bounds()
+    l, b, width, height = bbox.bounds
     r = l + width
     t = b + height
 
@@ -238,7 +238,7 @@ def _WX28_clipped_agg_as_bitmap(agg, bbox):
 
     Note: agg must be a backend_agg.RendererAgg instance.
     """
-    l, b, width, height = bbox.get_bounds()
+    l, b, width, height = bbox.bounds
     r = l + width
     t = b + height
 
diff --git a/lib/matplotlib/finance.py b/lib/matplotlib/finance.py
@@ -597,8 +597,8 @@ def volume_overlay3(ax, quotes,
     maxy = max([volume for d, open, close, high, low, volume in quotes])
     corners = (minpy, miny), (maxx, maxy)
     ax.update_datalim(corners)
-    #print 'datalim', ax.dataLim.get_bounds()
-    #print 'viewlim', ax.viewLim.get_bounds()
+    #print 'datalim', ax.dataLim.bounds
+    #print 'viewlim', ax.viewLim.bounds
 
     ax.add_collection(barCollection)
     ax.autoscale_view()
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -1414,12 +1414,12 @@ def bbox_artist(artist, renderer, props=None, fill=True):
     pad = props.pop('pad', 4)
     pad = renderer.points_to_pixels(pad)
     bbox = artist.get_window_extent(renderer)
-    l,b,w,h = bbox.bounds
-    l-=pad/2.
-    b-=pad/2.
-    w+=pad
-    h+=pad
-    r = Rectangle(xy=(l,b),
+    l, b, w, h = bbox.bounds
+    l -= pad/2.
+    b -= pad/2.
+    w += pad
+    h += pad
+    r = Rectangle(xy=(l, b),
                   width=w,
                   height=h,
                   fill=fill,
@@ -1438,8 +1438,8 @@ def draw_bbox(bbox, renderer, color='k', trans=None):
     to test whether the artist is returning the correct bbox.
     """
 
-    l,b,w,h = bbox.get_bounds()
-    r = Rectangle(xy=(l,b),
+    l, b, w, h = bbox.bounds
+    r = Rectangle(xy=(l, b),
                   width=w,
                   height=h,
                   edgecolor=color,
