SF.net SVN: matplotlib:[8559] branches/v1_0_maint

2010-07-16 Thread ianthomas23 
Revision: 8559
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8559&view=rev
Author:   ianthomas23
Date: 2010-07-16 13:46:14 + (Fri, 16 Jul 2010)

Log Message:
---
Added tri* functions to pyplot docs.

Modified Paths:
--
branches/v1_0_maint/doc/_templates/index.html
branches/v1_0_maint/doc/api/api_changes.rst
branches/v1_0_maint/lib/matplotlib/pylab.py
branches/v1_0_maint/lib/matplotlib/tri/tricontour.py

Modified: branches/v1_0_maint/doc/_templates/index.html
===
--- branches/v1_0_maint/doc/_templates/index.html   2010-07-15 20:47:28 UTC 
(rev 8558)
+++ branches/v1_0_maint/doc/_templates/index.html   2010-07-16 13:46:14 UTC 
(rev 8559)
@@ -994,7 +994,6 @@
   
 
 
-
 
   
 title
@@ -1008,6 +1007,50 @@
 
 
   
+tricontour
+
+  
+
+  
+make a contour plot on a triangular grid
+  
+
+
+
+  
+tricontourf
+
+  
+
+  
+make a filled contour plot on a triangular grid
+  
+
+
+
+  
+tripcolor
+
+  
+
+  
+make a pseudocolor plot on a triangular grid
+  
+
+
+
+  
+triplot
+
+  
+
+  
+plot a triangular grid
+  
+
+
+
+  
 xcorr
 
   

Modified: branches/v1_0_maint/doc/api/api_changes.rst
===
--- branches/v1_0_maint/doc/api/api_changes.rst 2010-07-15 20:47:28 UTC (rev 
8558)
+++ branches/v1_0_maint/doc/api/api_changes.rst 2010-07-16 13:46:14 UTC (rev 
8559)
@@ -117,6 +117,21 @@
 
 draw_image(self, gc, x, y, im)
 
+* There are four new Axes methods with corresponding pyplot
+  functions that deal with unstructured triangular grids:
+
+  + :meth:`matplotlib.axes.Axes.tricontour` draws contour lines
+on a triangular grid.
+
+  + :meth:`matplotlib.axes.Axes.tricontourf` draws filled contours
+on a triangular grid.
+
+  + :meth:`matplotlib.axes.Axes.tripcolor` draws a pseudocolor
+plot on a triangular grid.
+
+  + :meth:`matplotlib.axes.Axes.triplot` draws a triangular grid
+as lines and/or markers.
+
 Changes in 0.99
 ==
 

Modified: branches/v1_0_maint/lib/matplotlib/pylab.py
===
--- branches/v1_0_maint/lib/matplotlib/pylab.py 2010-07-15 20:47:28 UTC (rev 
8558)
+++ branches/v1_0_maint/lib/matplotlib/pylab.py 2010-07-16 13:46:14 UTC (rev 
8559)
@@ -92,6 +92,10 @@
   tick_params - control the appearance of ticks and tick labels
   ticklabel_format - control the format of tick labels
   title- add a title to the current axes
+  tricontour - make a contour plot on a triangular grid
+  tricontourf - make a filled contour plot on a triangular grid
+  tripcolor - make a pseudocolor plot on a triangular grid
+  triplot - plot a triangular grid
   xcorr   - plot the autocorrelation function of x and y
   xlim - set/get the xlimits
   ylim - set/get the ylimits

Modified: branches/v1_0_maint/lib/matplotlib/tri/tricontour.py
===
--- branches/v1_0_maint/lib/matplotlib/tri/tricontour.py2010-07-15 
20:47:28 UTC (rev 8558)
+++ branches/v1_0_maint/lib/matplotlib/tri/tricontour.py2010-07-16 
13:46:14 UTC (rev 8559)
@@ -93,7 +93,8 @@
 tricontour_doc = """
 :func:`~matplotlib.pyplot.tricontour` and
 :func:`~matplotlib.pyplot.tricontourf` draw contour lines and
-filled contours, respectively.  Except as noted, function
+filled contours, respectively, on an unstructured triangular
+grid.  Except as noted, function
 signatures and return values are the same for both versions.
 
 The triangulation can be specified in one of two ways; either::


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[8560] trunk/matplotlib

2010-07-16 Thread ianthomas23 
Revision: 8560
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8560&view=rev
Author:   ianthomas23
Date: 2010-07-16 13:55:35 + (Fri, 16 Jul 2010)

Log Message:
---
Merged revisions 8559 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint


  r8559 | ianthomas23 | 2010-07-16 14:46:14 +0100 (Fri, 16 Jul 2010) | 2 lines
  
  Added tri* functions to pyplot docs.


Modified Paths:
--
trunk/matplotlib/doc/_templates/index.html
trunk/matplotlib/doc/api/api_changes.rst
trunk/matplotlib/lib/matplotlib/pylab.py
trunk/matplotlib/lib/matplotlib/tri/tricontour.py

Property Changed:

trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
trunk/matplotlib/doc/sphinxext/gen_gallery.py
trunk/matplotlib/doc/sphinxext/gen_rst.py
trunk/matplotlib/examples/misc/multiprocess.py
trunk/matplotlib/examples/mplot3d/contour3d_demo.py
trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
trunk/matplotlib/examples/mplot3d/polys3d_demo.py
trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
trunk/matplotlib/examples/mplot3d/surface3d_demo.py
trunk/matplotlib/examples/mplot3d/wire3d_demo.py
trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py

trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png


Property changes on: trunk/matplotlib
___
Modified: svnmerge-integrated
   - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 
/branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8557 
/trunk/matplotlib:1-7315
   + /trunk/matplotlib:1-7315 /branches/mathtex:1-7263 
/branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 
/branches/v1_0_maint:1-8559
Modified: svn:mergeinfo
   - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557
   + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559

Modified: trunk/matplotlib/doc/_templates/index.html
===
--- trunk/matplotlib/doc/_templates/index.html  2010-07-16 13:46:14 UTC (rev 
8559)
+++ trunk/matplotlib/doc/_templates/index.html  2010-07-16 13:55:35 UTC (rev 
8560)
@@ -994,7 +994,6 @@
   
 
 
-
 
   
 title
@@ -1008,6 +1007,50 @@
 
 
   
+tricontour
+
+  
+
+  
+make a contour plot on a triangular grid
+  
+
+
+
+  
+tricontourf
+
+  
+
+  
+make a filled contour plot on a triangular grid
+  
+
+
+
+  
+tripcolor
+
+  
+
+  
+make a pseudocolor plot on a triangular grid
+  
+
+
+
+  
+triplot
+
+  
+
+  
+plot a triangular grid
+  
+
+
+
+  
 xcorr
 
   

Modified: trunk/matplotlib/doc/api/api_changes.rst
===
-

SF.net SVN: matplotlib:[8561] branches/py3k

2010-07-16 Thread mdboom 
Revision: 8561
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8561&view=rev
Author:   mdboom
Date: 2010-07-16 18:45:49 + (Fri, 16 Jul 2010)

Log Message:
---
Able to produce simple_plot.py!!!

Modified Paths:
--
branches/py3k/examples/pylab_examples/simple_plot.py
branches/py3k/lib/matplotlib/artist.py
branches/py3k/lib/matplotlib/axes.py
branches/py3k/lib/matplotlib/backends/backend_agg.py
branches/py3k/lib/matplotlib/backends/tkagg.py
branches/py3k/lib/matplotlib/docstring.py
branches/py3k/lib/matplotlib/figure.py
branches/py3k/lib/matplotlib/font_manager.py
branches/py3k/lib/matplotlib/lines.py
branches/py3k/lib/matplotlib/mlab.py
branches/py3k/lib/matplotlib/patches.py
branches/py3k/lib/matplotlib/text.py
branches/py3k/setup.py
branches/py3k/setupext.py
branches/py3k/src/_backend_agg.cpp
branches/py3k/src/_png.cpp

Removed Paths:
-
branches/py3k/src/nxutils.c

Modified: branches/py3k/examples/pylab_examples/simple_plot.py
===
--- branches/py3k/examples/pylab_examples/simple_plot.py2010-07-16 
13:55:35 UTC (rev 8560)
+++ branches/py3k/examples/pylab_examples/simple_plot.py2010-07-16 
18:45:49 UTC (rev 8561)
@@ -8,4 +8,5 @@
 ylabel('voltage (mV)')
 title('About as simple as it gets, folks')
 grid(True)
+savefig("test.png")
 show()

Modified: branches/py3k/lib/matplotlib/artist.py
===
--- branches/py3k/lib/matplotlib/artist.py  2010-07-16 13:55:35 UTC (rev 
8560)
+++ branches/py3k/lib/matplotlib/artist.py  2010-07-16 18:45:49 UTC (rev 
8561)
@@ -481,7 +481,7 @@
 :class:`~matplotlib.transforms.Transform`) |
 :class:`~matplotlib.patches.Patch` | None ]
 """
-from patches import Patch, Rectangle
+from matplotlib.patches import Patch, Rectangle
 
 success = False
 if transform is None:

Modified: branches/py3k/lib/matplotlib/axes.py
===
--- branches/py3k/lib/matplotlib/axes.py2010-07-16 13:55:35 UTC (rev 
8560)
+++ branches/py3k/lib/matplotlib/axes.py2010-07-16 18:45:49 UTC (rev 
8561)
@@ -1,5 +1,5 @@
 from __future__ import division, generators
-import math, sys, warnings, datetime, new
+import math, sys, warnings, datetime
 from operator import itemgetter
 import itertools
 
@@ -8400,9 +8400,15 @@
 
 new_class = _subplot_classes.get(axes_class)
 if new_class is None:
-new_class = new.classobj("%sSubplot" % (axes_class.__name__),
- (SubplotBase, axes_class),
- {'_axes_class': axes_class})
+if sys.hexversion >= 0x0300:
+new_class = type("%sSubplot" % (axes_class.__name__),
+ (SubplotBase, axes_class),
+ {'_axes_class': axes_class})
+else:
+import new
+new_class = new.classobj("%sSubplot" % (axes_class.__name__),
+ (SubplotBase, axes_class),
+ {'_axes_class': axes_class})
 _subplot_classes[axes_class] = new_class
 
 return new_class

Modified: branches/py3k/lib/matplotlib/backends/backend_agg.py
===
--- branches/py3k/lib/matplotlib/backends/backend_agg.py2010-07-16 
13:55:35 UTC (rev 8560)
+++ branches/py3k/lib/matplotlib/backends/backend_agg.py2010-07-16 
18:45:49 UTC (rev 8561)
@@ -35,7 +35,7 @@
 from matplotlib.path import Path
 from matplotlib.transforms import Bbox, BboxBase
 
-from _backend_agg import RendererAgg as _RendererAgg
+from matplotlib.backends._backend_agg import RendererAgg as _RendererAgg
 from matplotlib import _png
 
 backend_version = 'v2.2'
@@ -429,7 +429,7 @@
 original_dpi = renderer.dpi
 renderer.dpi = self.figure.dpi
 if is_string_like(filename_or_obj):
-filename_or_obj = file(filename_or_obj, 'wb')
+filename_or_obj = open(filename_or_obj, 'wb')
 renderer._renderer.write_rgba(filename_or_obj)
 renderer.dpi = original_dpi
 print_rgba = print_raw
@@ -440,7 +440,7 @@
 original_dpi = renderer.dpi
 renderer.dpi = self.figure.dpi
 if is_string_like(filename_or_obj):
-filename_or_obj = file(filename_or_obj, 'wb')
+filename_or_obj = open(filename_or_obj, 'wb')
 _png.write_png(renderer._renderer.buffer_rgba(0, 0),
renderer.width, renderer.height,
filename_or_obj, self.figure.dpi)

Modified: branches/py3k/lib/matplotlib/backends/tkagg.py
===
--- branches/py3k/lib/matplotlib/backends/tkagg.py  2010-07-16 1

SF.net SVN: matplotlib:[8562] branches/v1_0_maint/lib/matplotlib

2010-07-16 Thread efiring 
Revision: 8562
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8562&view=rev
Author:   efiring
Date: 2010-07-16 20:44:52 + (Fri, 16 Jul 2010)

Log Message:
---
backends: factored out most of the show() code into ShowBase class.
Also fixed various fltkagg problems.

Modified Paths:
--
branches/v1_0_maint/lib/matplotlib/backend_bases.py
branches/v1_0_maint/lib/matplotlib/backends/backend_cocoaagg.py
branches/v1_0_maint/lib/matplotlib/backends/backend_fltkagg.py
branches/v1_0_maint/lib/matplotlib/backends/backend_gtk.py
branches/v1_0_maint/lib/matplotlib/backends/backend_macosx.py
branches/v1_0_maint/lib/matplotlib/backends/backend_qt.py
branches/v1_0_maint/lib/matplotlib/backends/backend_qt4.py
branches/v1_0_maint/lib/matplotlib/backends/backend_tkagg.py
branches/v1_0_maint/lib/matplotlib/backends/backend_wx.py

Modified: branches/v1_0_maint/lib/matplotlib/backend_bases.py
===
--- branches/v1_0_maint/lib/matplotlib/backend_bases.py 2010-07-16 18:45:49 UTC 
(rev 8561)
+++ branches/v1_0_maint/lib/matplotlib/backend_bases.py 2010-07-16 20:44:52 UTC 
(rev 8562)
@@ -21,6 +21,11 @@
 pressed, x and y locations in pixel and
 :class:`~matplotlib.axes.Axes` coordinates.
 
+:class:`ShowBase`
+The base class for the Show class of each interactive backend;
+the 'show' callable is then set to Show.__call__, inherited from
+ShowBase.
+
 """
 
 from __future__ import division
@@ -33,6 +38,8 @@
 import matplotlib.widgets as widgets
 #import matplotlib.path as path
 from matplotlib import rcParams
+from matplotlib import is_interactive
+from matplotlib._pylab_helpers import Gcf
 
 from matplotlib.transforms import Bbox, TransformedBbox, Affine2D
 import cStringIO
@@ -49,7 +56,37 @@
 _backend_d[format] = backend_class
 
 
+class ShowBase(object):
+"""
+Simple base class to generate a show() callable in backends.
 
+Subclass must override mainloop() method.
+"""
+def __call__(self):
+"""
+Show all figures.
+"""
+managers = Gcf.get_all_fig_managers()
+if not managers:
+return
+
+for manager in managers:
+manager.show()
+
+try:
+if not self._needmain:  # ipython flag
+return
+except AttributeError:
+pass
+
+if not is_interactive():
+self.mainloop()
+
+def mainloop(self):
+pass
+
+
+
 class RendererBase:
 """An abstract base class to handle drawing/rendering operations.
 

Modified: branches/v1_0_maint/lib/matplotlib/backends/backend_cocoaagg.py
===
--- branches/v1_0_maint/lib/matplotlib/backends/backend_cocoaagg.py 
2010-07-16 18:45:49 UTC (rev 8561)
+++ branches/v1_0_maint/lib/matplotlib/backends/backend_cocoaagg.py 
2010-07-16 20:44:52 UTC (rev 8562)
@@ -30,6 +30,8 @@
 import matplotlib
 from matplotlib.figure import Figure
 from matplotlib.backend_bases import FigureManagerBase, FigureCanvasBase
+from matplotlib.backend_bases import ShowBase
+
 from backend_agg import FigureCanvasAgg
 from matplotlib._pylab_helpers import Gcf
 
@@ -41,10 +43,24 @@
 canvas = FigureCanvasCocoaAgg(thisFig)
 return FigureManagerCocoaAgg(canvas, num)
 
-def show():
-for manager in Gcf.get_all_fig_managers():
-manager.show()
+## Below is the original show() function:
+#def show():
+#for manager in Gcf.get_all_fig_managers():
+#manager.show()
+#
+## It appears that this backend is unusual in having a separate
+## run function invoked for each figure, instead of a single
+## mainloop.  Presumably there is no blocking at all.
+##
+## Using the Show class below should cause no difference in
+## behavior.
 
+class Show(ShowBase):
+def mainloop(self):
+pass
+
+show = Show()
+
 def draw_if_interactive():
 if matplotlib.is_interactive():
 figManager =  Gcf.get_active()

Modified: branches/v1_0_maint/lib/matplotlib/backends/backend_fltkagg.py
===
--- branches/v1_0_maint/lib/matplotlib/backends/backend_fltkagg.py  
2010-07-16 18:45:49 UTC (rev 8561)
+++ branches/v1_0_maint/lib/matplotlib/backends/backend_fltkagg.py  
2010-07-16 20:44:52 UTC (rev 8562)
@@ -24,24 +24,14 @@
 from matplotlib.backend_bases import \
  RendererBase, GraphicsContextBase, FigureManagerBase, FigureCanvasBase,\
  NavigationToolbar2, cursors
+from matplotlib.backend_bases import ShowBase
+
+
 from matplotlib.figure import Figure
 from matplotlib._pylab_helpers import Gcf
 import matplotlib.backends.windowing as windowing
 from matplotlib.widgets import SubplotTool
 
-
-import thread,time
-
-Fl_running=thread.allocate_lock()
-def Fltk_run_interactive():
-global Fl_running
-if Fl_running.acquire(0):
-  while True:
-Fltk.

SF.net SVN: matplotlib:[8563] trunk/matplotlib

2010-07-16 Thread efiring 
Revision: 8563
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8563&view=rev
Author:   efiring
Date: 2010-07-16 20:55:35 + (Fri, 16 Jul 2010)

Log Message:
---
Merged revisions 8559,8562 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint


  r8559 | ianthomas23 | 2010-07-16 03:46:14 -1000 (Fri, 16 Jul 2010) | 2 lines
  
  Added tri* functions to pyplot docs.

  r8562 | efiring | 2010-07-16 10:44:52 -1000 (Fri, 16 Jul 2010) | 3 lines
  
  backends: factored out most of the show() code into ShowBase class.
  Also fixed various fltkagg problems.


Modified Paths:
--
trunk/matplotlib/lib/matplotlib/backend_bases.py
trunk/matplotlib/lib/matplotlib/backends/backend_cocoaagg.py
trunk/matplotlib/lib/matplotlib/backends/backend_fltkagg.py
trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
trunk/matplotlib/lib/matplotlib/backends/backend_macosx.py
trunk/matplotlib/lib/matplotlib/backends/backend_qt.py
trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py
trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py
trunk/matplotlib/lib/matplotlib/backends/backend_wx.py

Property Changed:

trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
trunk/matplotlib/doc/sphinxext/gen_gallery.py
trunk/matplotlib/doc/sphinxext/gen_rst.py
trunk/matplotlib/examples/misc/multiprocess.py
trunk/matplotlib/examples/mplot3d/contour3d_demo.py
trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
trunk/matplotlib/examples/mplot3d/polys3d_demo.py
trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
trunk/matplotlib/examples/mplot3d/surface3d_demo.py
trunk/matplotlib/examples/mplot3d/wire3d_demo.py
trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py

trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png


Property changes on: trunk/matplotlib
___
Modified: svn:mergeinfo
   - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559
   + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8562


Property changes on: trunk/matplotlib/doc/pyplots/README
___
Modified: svn:mergeinfo
   - 
/branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740