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

[<jd...@us...>]

Revision: 6860
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6860&view=rev
Author:   jdh2358
Date:     2009-01-30 16:21:14 +0000 (Fri, 30 Jan 2009)

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

........
  r6859 | jdh2358 | 2009-01-30 08:19:49 -0800 (Fri, 30 Jan 2009) | 1 line
  
  purge pyexcelerator refs from docstrings, etc
........

Modified Paths:
--------------
    trunk/matplotlib/examples/pylab_examples/loadrec.py
    trunk/matplotlib/lib/mpl_toolkits/exceltools.py
    trunk/matplotlib/lib/mpl_toolkits/gtktools.py

Property Changed:
----------------
    trunk/matplotlib/
    trunk/matplotlib/doc/pyplots/README
    trunk/matplotlib/doc/sphinxext/gen_gallery.py
    trunk/matplotlib/doc/sphinxext/gen_rst.py


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6856
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6859
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
   + /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


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
   + /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


Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856
   + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859


Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856
   + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859

Modified: trunk/matplotlib/examples/pylab_examples/loadrec.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/loadrec.py	2009-01-30 16:19:49 UTC (rev 6859)
+++ trunk/matplotlib/examples/pylab_examples/loadrec.py	2009-01-30 16:21:14 UTC (rev 6860)
@@ -10,7 +10,7 @@
 ax.plot(a.date, a.adj_close, '-')
 fig.autofmt_xdate()
 
-# if you have pyExcelerator installed, you can output excel
+# if you have xlwt installed, you can output excel
 import mpl_toolkits.exceltools as exceltools
 exceltools.rec2excel(a, 'test.xls')
 show()

Modified: trunk/matplotlib/lib/mpl_toolkits/exceltools.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/exceltools.py	2009-01-30 16:19:49 UTC (rev 6859)
+++ trunk/matplotlib/lib/mpl_toolkits/exceltools.py	2009-01-30 16:21:14 UTC (rev 6860)
@@ -1,5 +1,5 @@
 """
-Some io tools for excel -- requires pypyExcelerator
+Some io tools for excel -- requires xlwt
 
 Example usage:
 
@@ -59,7 +59,7 @@
 
 def rec2excel(r, ws, formatd=None, rownum=0, colnum=0, nanstr='NaN', infstr='Inf'):
     """
-    save record array r to excel pyExcelerator worksheet ws
+    save record array r to excel xlwt worksheet ws
     starting at rownum.  if ws is string like, assume it is a
     filename and save to it
 

Modified: trunk/matplotlib/lib/mpl_toolkits/gtktools.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/gtktools.py	2009-01-30 16:19:49 UTC (rev 6859)
+++ trunk/matplotlib/lib/mpl_toolkits/gtktools.py	2009-01-30 16:21:14 UTC (rev 6860)
@@ -298,10 +298,6 @@
 
 def rec2gtk(r, formatd=None, rownum=0, autowin=True):
     """
-    save record array r to excel pyExcelerator worksheet ws
-    starting at rownum.  if ws is string like, assume it is a
-    filename and save to it
-
     formatd is a dictionary mapping dtype name -> mlab.Format instances
 
     This function creates a SortedStringsScrolledWindow (derived


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