Skip to content

Commit 243530b

Browse files
committed
some quick log fixes
svn path=/trunk/matplotlib/; revision=1162
1 parent b01f1a0 commit 243530b

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

TODO

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
681681

682682
-- axes packing sizes
683683

684-
-- direction fields
684+
-- DONE direction fields
685685

686686
-- DONE add a force option to the add_axes code.
687687

@@ -691,7 +691,7 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
691691

692692
-- DONE hide lazy values make dpi and friends setters
693693

694-
-- add a get description to axes which returns the args and kwargs to
694+
-- CLOSED add a get description to axes which returns the args and kwargs to
695695
construct it
696696

697697
-- restore __all__ to pylab and add ArtistInspector
@@ -703,4 +703,4 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
703703

704704
-- DONE colorbar not updating in CVS
705705

706-
-- tkagg figure not launching new figure until plot is called?
706+
-- DONE tkagg figure not launching new figure until plot is called?

lib/matplotlib/axes.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1832,8 +1832,8 @@ def legend(self, *args, **kwargs):
18321832
18331833
The location codes are
18341834
1835-
'best' : 0, (default)
1836-
'upper right' : 1,
1835+
'best' : 0,
1836+
'upper right' : 1, (default)
18371837
'upper left' : 2,
18381838
'lower left' : 3,
18391839
'lower right' : 4,
@@ -1873,13 +1873,13 @@ def get_handles():
18731873
if len(args)==0:
18741874
labels = [line.get_label() for line in get_handles()]
18751875
handles = get_handles()
1876-
loc = popd(kwargs, 'loc', 0)
1876+
loc = popd(kwargs, 'loc', 1)
18771877

18781878
elif len(args)==1:
18791879
# LABELS
18801880
labels = args[0]
18811881
handles = [h for h, label in zip(get_handles(), labels)]
1882-
loc = popd(kwargs, 'loc', 0)
1882+
loc = popd(kwargs, 'loc', 1)
18831883

18841884
elif len(args)==2:
18851885
if is_string_like(args[1]) or isinstance(args[1], int):
@@ -1889,7 +1889,7 @@ def get_handles():
18891889
else:
18901890
# LINES, LABELS
18911891
handles, labels = args
1892-
loc = popd(kwargs, 'loc', 0)
1892+
loc = popd(kwargs, 'loc', 1)
18931893

18941894
elif len(args)==3:
18951895
# LINES, LABELS, LOC

lib/matplotlib/backends/backend_ps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ def draw_line(self, gc, x0, y0, x1, y1):
299299
ps = '%1.3f %1.3f m %1.3f %1.3f l'%(x0, y0, x1, y1)
300300
self._draw_ps(ps, gc, None, "line")
301301

302-
def draw_markers(self, gc, path, rgbFace, x, y, transform):
302+
def _draw_markers(self, gc, path, rgbFace, x, y, transform):
303303
"""
304304
Draw the markers defined by path at each of the positions in x
305305
and y. path coordinates are points, x and y coords will be

lib/matplotlib/legend.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
The location codes are
77
8-
'best' : 0, (currently not supported, defaults to upper right)
8+
'best' : 0,
99
'upper right' : 1, (default)
1010
'upper left' : 2,
1111
'lower left' : 3,
@@ -45,7 +45,7 @@ class Legend(Artist):
4545
4646
The location codes are
4747
48-
'best' : 0, (currently not supported, defaults to upper right)
48+
'best' : 0,
4949
'upper right' : 1, (default)
5050
'upper left' : 2,
5151
'lower left' : 3,
@@ -113,7 +113,7 @@ def __init__(self, parent, handles, labels, loc,
113113
Artist.__init__(self)
114114
if is_string_like(loc) and not self.codes.has_key(loc):
115115
warnings.warn('Unrecognized location %s. Falling back on upper right; valid locations are\n%s\t' %(loc, '\n\t'.join(self.codes.keys())))
116-
if is_string_like(loc): loc = self.codes.get(loc, 0)
116+
if is_string_like(loc): loc = self.codes.get(loc, 1)
117117

118118
self.numpoints = numpoints
119119
self.prop = prop

0 commit comments

Comments
 (0)