Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 1c5a45a

Browse files
committed
Merge pull request #5936 from jenshnielsen/merge2xmaster
Merge 2x to master
2 parents 2a4863c + b118650 commit 1c5a45a

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

doc/_templates/index.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,7 @@ <h4>Need help?</h4>
151151

152152
<p>To keep up to date with what's going on in matplotlib, see
153153
the <a href="{{ pathto('users/whats_new.html', 1) }}">what's new
154-
page</a>, the more detailed <a href="{{ pathto('_static/CHANGELOG', 1)
155-
}}">changelog</a> or browse
156-
the <a href="https://github.com/matplotlib/matplotlib">source
154+
page</a> or browse the <a href="https://github.com/matplotlib/matplotlib">source
157155
code</a>. Anything that could require changes to your existing code
158156
is logged in the <a href="{{ pathto('api/api_changes.html', 1) }}">api
159157
changes</a> file.</p>

lib/matplotlib/artist.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,8 @@ def set_axes(self, axes):
214214
215215
ACCEPTS: an :class:`~matplotlib.axes.Axes` instance
216216
"""
217-
warnings.warn(_get_axes_msg, mplDeprecation, stacklevel=1)
217+
warnings.warn(_get_axes_msg.format('set_axes'), mplDeprecation,
218+
stacklevel=1)
218219
self.axes = axes
219220

220221
def get_axes(self):
@@ -225,7 +226,8 @@ def get_axes(self):
225226
This has been deprecated in mpl 1.5, please use the
226227
axes property. Will be removed in 1.7 or 2.0.
227228
"""
228-
warnings.warn(_get_axes_msg, mplDeprecation, stacklevel=1)
229+
warnings.warn(_get_axes_msg.format('get_axes'), mplDeprecation,
230+
stacklevel=1)
229231
return self.axes
230232

231233
@property
@@ -1581,5 +1583,5 @@ def kwdoc(a):
15811583

15821584
docstring.interpd.update(Artist=kwdoc(Artist))
15831585

1584-
_get_axes_msg = """This has been deprecated in mpl 1.5, please use the
1586+
_get_axes_msg = """{} has been deprecated in mpl 1.5, please use the
15851587
axes property. A removal date has not been set."""

lib/matplotlib/testing/decorators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ def image_comparison(baseline_images=None, extensions=None, tol=0,
290290
291291
Otherwise, a list of extensions to test. For example ['png','pdf'].
292292
293-
*tol*: (default 13)
293+
*tol*: (default 0)
294294
The RMS threshold above which the test is considered failed.
295295
296296
*freetype_version*: str or tuple
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)