Revision: 5192
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5192&view=rev
Author: mdboom
Date: 2008-05-19 05:55:47 -0700 (Mon, 19 May 2008)
Log Message:
-----------
THIS MERGE IS NOT AS BIG AS IT LOOKS -- It is to correct an error
where somehow the svnmerge history was lost. This merge is in fact only
of r5191. I have left the revision ranges that svnmerge did here, but
edited the log list to only include r5191.
Merged revisions 4817-5171,5173-5177,5180,5182-5188,5190-5191 via svnmerge from
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_91_maint
........
r5191 | mdboom | 2008-05-19 08:12:30 -0400 (Mon, 19 May 2008) | 2 lines
Use is_string_like instead of explicitly string or unicode.
........
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/axes.py
trunk/matplotlib/lib/matplotlib/backends/backend_agg.py
Property Changed:
----------------
trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Name: svnmerge-integrated
- /branches/v0_91_maint:1-4816,5172,5178-5179,5181,5189
+ /branches/v0_91_maint:1-5191
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py 2008-05-19 12:12:30 UTC (rev
5191)
+++ trunk/matplotlib/lib/matplotlib/axes.py 2008-05-19 12:55:47 UTC (rev
5192)
@@ -331,7 +331,6 @@
self.set_patchprops(seg, **kwargs)
ret.append(seg)
-
if self.command == 'plot': func = makeline
else: func = makefill
if multicol:
@@ -2818,7 +2817,6 @@
autoscaled; default True. See Axes.autoscale_view for more
information
"""
-
scalex = kwargs.pop( 'scalex', True)
scaley = kwargs.pop( 'scaley', True)
@@ -3757,7 +3755,7 @@
xlolims=False, xuplims=False, **kwargs):
"""
ERRORBAR(x, y, yerr=None, xerr=None,
- fmt='b-', ecolor=None, elinewidth=None, capsize=3,
+ fmt='b-', ecolor=None, elinewidth=None, capsize=3,
barsabove=False, lolims=False, uplims=False,
xlolims=False, xuplims=False)
@@ -5472,7 +5470,7 @@
if not self._hold: self.cla()
n, bins = np.histogram(x, bins, range=None,
normed=bool(normed), new=True)
-
+
if cumulative:
if normed:
n = (n * np.diff(bins)).cumsum()
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_agg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_agg.py 2008-05-19
12:12:30 UTC (rev 5191)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_agg.py 2008-05-19
12:55:47 UTC (rev 5192)
@@ -289,7 +289,7 @@
renderer = self.get_renderer()
original_dpi = renderer.dpi
renderer.dpi = self.figure.dpi
- if type(filename_or_obj) in (str, unicode):
+ if is_string_like(filename_or_obj):
filename_or_obj = opefile(filename_or_obj, 'wb')
renderer._renderer.write_rgba(filename_or_obj)
renderer.dpi = original_dpi
@@ -300,7 +300,7 @@
renderer = self.get_renderer()
original_dpi = renderer.dpi
renderer.dpi = self.figure.dpi
- if type(filename_or_obj) in (str, unicode):
+ if is_string_like(filename_or_obj):
filename_or_obj = file(filename_or_obj, 'wb')
self.get_renderer()._renderer.write_png(filename_or_obj,
self.figure.dpi)
renderer.dpi = original_dpi
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: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
