8000 Merge v1.5.x into master · matplotlib/matplotlib@08acc8d · GitHub
[go: up one dir, main page]
Skip to content

Commit 08acc8d

Browse files
tacaswelltacaswell
committed
Merge v1.5.x into master
2 parents 0c4afcf + d2b2ef5 commit 08acc8d

File tree

3 files changed

+25
-28
lines changed

3 files changed

+25
-28
lines changed

‎doc/users/whats_new.rst‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ activity, but this can be problematic for the red/green colorblind. A new,
756756
colorblind-friendly colormap is now available at :class:`matplotlib.cm.Wistia`.
757757
This colormap maintains the red/green symbolism while achieving deuteranopic
758758
legibility through brightness variations. See
759-
`here <https://github.com/wistia/heatmap-palette>`_
759+
`here <https://github.com/wistia/heatmap-palette>`__
760760
for more information.
761761

762762
The nbagg backend
@@ -779,7 +779,7 @@ same way as any other matplotlib backend. Because figures require a connection
779779
to the IPython notebook server for their interactivity, once the notebook is
780780
saved, each figure will be rendered as a static image - thus allowing
781781
non-interactive viewing of figures on services such as
782-
`nbviewer <http://nbviewer.ipython.org/>`_.
782+
`nbviewer <http://nbviewer.ipython.org/>`__.
783783

784784

785785

@@ -1231,7 +1231,7 @@ New plotting features
12311231
````````````````````````````
12321232
To give your plots a sense of authority that they may be missing,
12331233
Michael Droettboom (inspired by the work of many others in
1234-
:ghpull:`1329`) has added an `xkcd-style <http://xkcd.com/>`_ sketch
1234+
:ghpull:`1329`) has added an `xkcd-style <http://xkcd.com/>`__ sketch
12351235
plotting mode. To use it, simply call :func:`matplotlib.pyplot.xkcd`
12361236
before creating your plot. For really fine control, it is also possible
12371237
to modify each artist's sketch parameters individually with
@@ -1456,14 +1456,14 @@ Numpydoc docstrings
14561456
```````````````````
14571457
Nelle Varoquaux has started an ongoing project to convert matplotlib's
14581458
docstrings to numpydoc format. See `MEP10
1459-
<https://github.com/matplotlib/matplotlib/wiki/Mep10>`_ for more
1459+
<https://github.com/matplotlib/matplotlib/wiki/Mep10>`__ for more
14601460
information.
14611461

14621462
Example reorganization
14631463
``````````````````````
14641464
Tony Yu has begun work reorganizing the examples into more meaningful
14651465
categories. The new gallery page is the fruit of this ongoing work.
1466-
See `MEP12 <https://github.com/matplotlib/matplotlib/wiki/MEP12>`_ for
1466+
See `MEP12 <https://github.com/matplotlib/matplotlib/wiki/MEP12>`__ for
14671467
more information.
14681468

14691469
Examples now use subplots()
@@ -1815,7 +1815,7 @@ Gerald Storer made the Qt4 backend compatible with PySide as
18151815
well as PyQT4. At present, however, PySide does not support
18161816
the PyOS_InputHook mechanism for handling gui events while
18171817
waiting for text input, so it cannot be used with the new
1818-
version 0.11 of `IPython <http://ipython.org>`_. Until this
1818+
version 0.11 of `IPython <http://ipython.org>`__. Until this
18191819
feature appears in PySide, IPython users should use
18201820
the PyQT4 wrapper for QT4, which remains the matplotlib default.
18211821

@@ -1943,7 +1943,7 @@ HTML5/Canvas backend
19431943
---------------------
19441944

19451945
Simon Ratcliffe and Ludwig Schwardt have released an `HTML5/Canvas
1946-
<http://code.google.com/p/mplh5canvas/>`_ backend for matplotlib. The
1946+
<http://code.google.com/p/mplh5canvas/>`__ backend for matplotlib. The
19471947
backend is almost feature complete, and they have done a lot of work
19481948
comparing their html5 rendered images with our core renderer Agg. The
19491949
backend features client/server interactive navigation of matplotlib
@@ -2000,9 +2000,9 @@ figures since the last call. Eric has done a lot of testing on the
20002000
user interface toolkits and versions and platforms he has access to,
20012001
but it is not possible to test them all, so please report problems to
20022002
the `mailing list
2003-
<http://mail.python.org/mailman/listinfo/matplotlib-users`_
2003+
<http://mail.python.org/mailman/listinfo/matplotlib-users>`__
20042004
and `bug tracker
2005-
<http://github.com/matplotlib/matplotlib/issues>`_.
2005+
<http://github.com/matplotlib/matplotlib/issues>`__.
20062006

20072007

20082008
mplot3d graphs can be embedded in arbitrary axes
@@ -2044,13 +2044,13 @@ Much improved software carpentry
20442044

20452045
The matplotlib trunk is probably in as good a shape as it has ever
20462046
been, thanks to improved `software carpentry
2047-
<http://software-carpentry.org/>`_. We now have a `buildbot
2048-
<http://buildbot.net/trac>`_ which runs a suite of `nose
2049-
<http://code.google.com/p/python-nose/>`_ regression tests on every
2047+
<http://software-carpentry.org/>`__. We now have a `buildbot
2048+
<http://buildbot.net/trac>`__ which runs a suite of `nose
2049+
<http://code.google.com/p/python-nose/>`__ regression tests on every
20502050
svn commit, auto-generating a set of images and comparing them against
20512051
a set of known-goods, sending emails to developers on failures with a
20522052
pixel-by-pixel `image comparison
2053-
<http://mpl.code.astraw.com/overview.html>`_. Releases and release
2053+
<http://mpl.code.astraw.com/overview.html>`__. Releases and release
20542054
bugfixes happen in branches, allowing active new feature development
20552055
to happen in the trunk while keeping the release branches stable.
20562056
Thanks to Andrew Straw, Michael Droettboom and other matplotlib
@@ -2061,7 +2061,7 @@ Bugfix marathon
20612061

20622062
Eric Firing went on a bug fixing and closing marathon, closing over
20632063
100 bugs on the `bug tracker
2064-
<http://sourceforge.net/tracker/?group_id=80706&atid=560720>`_ with
2064+
<http://sourceforge.net/tracker/?group_id=80706&atid=560720>`__ with
20652065
help from Jae-Joon Lee, Michael Droettboom, Christoph Gohlke and
20662066
Michiel de Hoon.
20672067

‎lib/matplotlib/cbook.py‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,19 +1012,16 @@ def mkdirs(newdir, mode=0o777):
10121012
> mkdir -p NEWDIR
10131013
> chmod MODE NEWDIR
10141014
"""
1015-
try:
1016-
if not os.path.exists(newdir):
1017-
parts = os.path.split(newdir)
1018-
for i in range(1, len(parts) + 1):
1019-
thispart = os.path.join(*parts[:i])
1020-
if not os.path.exists(thispart):
1021-
os.makedirs(thispart, mode)
1022-
1023-
except OSError as err:
1024-
# Reraise the error unless it's about an already existing directory
1025-
if err.errno != errno.EEXIST or not os.path.isdir(newdir):
1026-
raise
1027-
1015+
# this functionality is now in core python as of 3.2
1016+
# LPY DROP
1017+
if six.PY3:
1018+
os.makedirs(newdir, mode=mode, exist_ok=True)
1019+
else:
1020+
try:
1021+
os.makedirs(newdir, mode=mode)
1022+
except OSError as exception:
1023+
if exception.errno != errno.EEXIST:
1024+
raise
10281025

10291026
class GetRealpathAndStat(object):
10301027
def __init__(self):

‎lib/matplotlib/rcsetup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ def validate_cycler(s):
816816
'boxplot.flierprops.markerfacecolor': ['b', validate_color],
817817
'boxplot.flierprops.markeredgecolor': ['k', validate_color],
818818
'boxplot.flierprops.markersize': [6, validate_float],
819-
'boxplot.flierprops.linestyle': ['-', six.text_type],
819+
'boxplot.flierprops.linestyle': ['none', six.text_type],
820820
'boxplot.flierprops.linewidth': [1.0, validate_float],
821821

822822
'boxplot.boxprops.color': ['b', validate_color],

0 commit comments

Comments
 (0)
0