tagging 98.2

jdh2358 · jdh2358 · commit ca27821ea5fc · 2008-06-24T18:13:40.000Z
svn path=/trunk/matplotlib/; revision=5667
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -15,6 +15,7 @@ include lib/matplotlib/mpl-data/fonts/pdfcorefonts/*
 include lib/matplotlib/mpl-data/fonts/afm/*
 recursive-include license LICENSE*
 recursive-include examples *
+recursive-include doc *
 recursive-include src  *.cpp *.c *.h
 recursive-include CXX  *.cxx *.hxx *.c *.h
 recursive-include agg24 *
diff --git a/doc/make.py b/doc/make.py
@@ -20,8 +20,7 @@ def sf():
 
 def sfpdf():
     'push a copy to the sf site'
-
-    #os.system('cd build/latex; scp Matplotlib.pdf jdh2358@matplotlib.sf.net:/home/groups/m/ma/matplotlib/htdocs/doc/')
+    os.system('cd build/latex; scp Matplotlib.pdf jdh2358@matplotlib.sf.net:/home/groups/m/ma/matplotlib/htdocs/doc/')
 
 def figs():
     os.system('cd users/figures/ && python make.py')
diff --git a/examples/animation/dynamic_demo_wx.py b/examples/animation/dynamic_demo_wx.py
diff --git a/examples/user_interfaces/embedding_in_wx4.py b/examples/user_interfaces/embedding_in_wx4.py
@@ -8,11 +8,6 @@
 
 import matplotlib
 
-# uncomment the following to use wx rather than wxagg
-#matplotlib.use('WX')
-#from matplotlib.backends.backend_wx import FigureCanvasWx as FigureCanvas
-
-# comment out the following to use wx rather than wxagg
 matplotlib.use('WXAgg')
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
 from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -89,7 +89,7 @@
 """
 from __future__ import generators
 
-__version__  = '0.98.1'
+__version__  = '0.98.2'
 __revision__ = '$Revision$'
 __date__     = '$Date$'
 
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -690,37 +690,43 @@ def pprint_getters(self):
         return lines
 
 
-def getp(o, *args):
+def getp(o, property=None):
     """
-    .. TODO: What are 's' and 'h' arguments described below?
+    Return the value of handle property.  property is an optional string
+    for the property you want to return
 
-    Return the value of handle property s
+    Example usage::
 
-    h is an instance of a class, eg a Line2D or an Axes or Text.
-    if s is 'somename', this function returns
+        getp(o)  # get all the object properties
+        getp(o, 'linestyle')  # get the linestyle property
+
+
+    o is a :class:`Artist` instance, eg
+    :class:`~matplotllib.lines.Line2D` or an instance of a
+    :class:`~matplotlib.axes.Axes` or :class:`matplotlib.text.Text`.
+    If the *property* is 'somename', this function returns
 
       o.get_somename()
 
     getp can be used to query all the gettable properties with getp(o)
     Many properties have aliases for shorter typing, eg 'lw' is an
     alias for 'linewidth'.  In the output, aliases and full property
-    names will be listed as:
+    names will be listed as::
 
       property or  alias = value
 
-    e.g.:
+    e.g.::
 
       linewidth or lw = 2
     """
 
     insp = ArtistInspector(o)
 
-    if len(args)==0:
+    if property is None:
         print '\n'.join(insp.pprint_getters())
         return
 
-    name = args[0]
-    func = getattr(o, 'get_' + name)
+    func = getattr(o, 'get_' + property)
     return func()
 
 def get(o, *args, **kwargs):
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
@@ -178,9 +178,7 @@ def __init__(self, axis, **kwargs):
         *subsx*/*subsy*:
            Where to place the subticks between each major tick.
            Should be a sequence of integers.  For example, in a log10
-           scale::
-
-             [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+           scale: ``[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]``
 
            will place 10 logarithmically spaced minor ticks between
            each major tick.
@@ -291,9 +289,7 @@ def __init__(self, axis, **kwargs):
         *subsx*/*subsy*:
            Where to place the subticks between each major tick.
            Should be a sequence of integers.  For example, in a log10
-           scale::
-
-             [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+           scale: ``[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]``
 
            will place 10 logarithmically spaced minor ticks between
            each major tick.
