Skip to content

Commit ca27821

Browse files
committed
tagging 98.2
svn path=/trunk/matplotlib/; revision=5667
1 parent 4c2e06b commit ca27821

File tree

7 files changed

+21
-156
lines changed

7 files changed

+21
-156
lines changed

MANIFEST.in

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ include lib/matplotlib/mpl-data/fonts/pdfcorefonts/*
1515
include lib/matplotlib/mpl-data/fonts/afm/*
1616
recursive-include license LICENSE*
1717
recursive-include examples *
18+
recursive-include doc *
1819
recursive-include src *.cpp *.c *.h
1920
recursive-include CXX *.cxx *.hxx *.c *.h
2021
recursive-include agg24 *

doc/make.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ def sf():
2020

2121
def sfpdf():
2222
'push a copy to the sf site'
23-
24-
#os.system('cd build/latex; scp Matplotlib.pdf jdh2358@matplotlib.sf.net:/home/groups/m/ma/matplotlib/htdocs/doc/')
23+
os.system('cd build/latex; scp Matplotlib.pdf jdh2358@matplotlib.sf.net:/home/groups/m/ma/matplotlib/htdocs/doc/')
2524

2625
def figs():
2726
os.system('cd users/figures/ && python make.py')

examples/animation/dynamic_demo_wx.py

-132
This file was deleted.

examples/user_interfaces/embedding_in_wx4.py

-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88

99
import matplotlib
1010

11-
# uncomment the following to use wx rather than wxagg
12-
#matplotlib.use('WX')
13-
#from matplotlib.backends.backend_wx import FigureCanvasWx as FigureCanvas
14-
15-
# comment out the following to use wx rather than wxagg
1611
matplotlib.use('WXAgg')
1712
from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
1813
from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg

lib/matplotlib/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"""
9090
from __future__ import generators
9191

92-
__version__ = '0.98.1'
92+
__version__ = '0.98.2'
9393
__revision__ = '$Revision$'
9494
__date__ = '$Date$'
9595

lib/matplotlib/artist.py

+16-10
Original file line numberDiff line numberDiff line change
@@ -690,37 +690,43 @@ def pprint_getters(self):
690690
return lines
691691

692692

693-
def getp(o, *args):
693+
def getp(o, property=None):
694694
"""
695-
.. TODO: What are 's' and 'h' arguments described below?
695+
Return the value of handle property. property is an optional string
696+
for the property you want to return
696697
697-
Return the value of handle property s
698+
Example usage::
698699
699-
h is an instance of a class, eg a Line2D or an Axes or Text.
700-
if s is 'somename', this function returns
700+
getp(o) # get all the object properties
701+
getp(o, 'linestyle') # get the linestyle property
702+
703+
704+
o is a :class:`Artist` instance, eg
705+
:class:`~matplotllib.lines.Line2D` or an instance of a
706+
:class:`~matplotlib.axes.Axes` or :class:`matplotlib.text.Text`.
707+
If the *property* is 'somename', this function returns
701708
702709
o.get_somename()
703710
704711
getp can be used to query all the gettable properties with getp(o)
705712
Many properties have aliases for shorter typing, eg 'lw' is an
706713
alias for 'linewidth'. In the output, aliases and full property
707-
names will be listed as:
714+
names will be listed as::
708715
709716
property or alias = value
710717
711-
e.g.:
718+
e.g.::
712719
713720
linewidth or lw = 2
714721
"""
715722

716723
insp = ArtistInspector(o)
717724

718-
if len(args)==0:
725+
if property is None:
719726
print '\n'.join(insp.pprint_getters())
720727
return
721728

722-
name = args[0]
723-
func = getattr(o, 'get_' + name)
729+
func = getattr(o, 'get_' + property)
724730
return func()
725731

726732
def get(o, *args, **kwargs):

lib/matplotlib/scale.py

+2-6
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,7 @@ def __init__(self, axis, **kwargs):
178178
*subsx*/*subsy*:
179179
Where to place the subticks between each major tick.
180180
Should be a sequence of integers. For example, in a log10
181-
scale::
182-
183-
[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
181+
scale: ``[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]``
184182
185183
will place 10 logarithmically spaced minor ticks between
186184
each major tick.
@@ -291,9 +289,7 @@ def __init__(self, axis, **kwargs):
291289
*subsx*/*subsy*:
292290
Where to place the subticks between each major tick.
293291
Should be a sequence of integers. For example, in a log10
294-
scale::
295-
296-
[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
292+
scale: ``[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]``
297293
298294
will place 10 logarithmically spaced minor ticks between
299295
each major tick.

0 commit comments

Comments
 (0)