matplotlib · jenshnielsen · Mar 30, 2016 · Dec 31, 2015 · Jan 2, 2016 · Jan 2, 2016
diff --git a/LICENSE/LICENSE b/LICENSE/LICENSE
@@ -1,5 +1,55 @@
-LICENSE AGREEMENT FOR MATPLOTLIB 1.2.0
---------------------------------------
+License agreement for matplotlib versions 1.3.0 and later
+=========================================================
+
+1. This LICENSE AGREEMENT is between the Matplotlib Development Team
+("MDT"), and the Individual or Organization ("Licensee") accessing and
+otherwise using matplotlib software in source or binary form and its
+associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, MDT
+hereby grants Licensee a nonexclusive, royalty-free, world-wide license
+to reproduce, analyze, test, perform and/or display publicly, prepare
+derivative works, distribute, and otherwise use matplotlib
+alone or in any derivative version, provided, however, that MDT's
+License Agreement and MDT's notice of copyright, i.e., "Copyright (c)
+2012- Matplotlib Development Team; All Rights Reserved" are retained in
+matplotlib  alone or in any derivative version prepared by
+Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on or
+incorporates matplotlib or any part thereof, and wants to
+make the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to matplotlib .
+
+4. MDT is making matplotlib available to Licensee on an "AS
+IS" basis.  MDT MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, MDT MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB
+WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. MDT SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
+ FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
+LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
+MATPLOTLIB , OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
+THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between MDT and
+Licensee.  This License Agreement does not grant permission to use MDT
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using matplotlib ,
+Licensee agrees to be bound by the terms and conditions of this License
+    Agreement.
+
+License agreement for matplotlib versions prior to 1.3.0
+========================================================
 
 1. This LICENSE AGREEMENT is between John D. Hunter ("JDH"), and the
 Individual or Organization ("Licensee") accessing and otherwise using
@@ -9,30 +59,30 @@ documentation.
 2. Subject to the terms and conditions of this License Agreement, JDH
 hereby grants Licensee a nonexclusive, royalty-free, world-wide license
 to reproduce, analyze, test, perform and/or display publicly, prepare
-derivative works, distribute, and otherwise use matplotlib 1.2.0
+derivative works, distribute, and otherwise use matplotlib
 alone or in any derivative version, provided, however, that JDH's
 License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
 2002-2011 John D. Hunter; All Rights Reserved" are retained in
-matplotlib 1.2.0 alone or in any derivative version prepared by
+matplotlib  alone or in any derivative version prepared by
 Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on or
-incorporates matplotlib 1.2.0 or any part thereof, and wants to
+incorporates matplotlib  or any part thereof, and wants to
 make the derivative work available to others as provided herein, then
 Licensee hereby agrees to include in any such work a brief summary of
-the changes made to matplotlib 1.2.0.
+the changes made to matplotlib.
 
-4. JDH is making matplotlib 1.2.0 available to Licensee on an "AS
+4. JDH is making matplotlib  available to Licensee on an "AS
 IS" basis.  JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
 IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
 DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 1.2.0
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB
 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
 
 5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
-1.2.0 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
+ FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
 LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
-MATPLOTLIB 1.2.0, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
+MATPLOTLIB , OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
 THE POSSIBILITY THEREOF.
 
 6. This License Agreement will automatically terminate upon a material
@@ -44,6 +94,6 @@ Licensee.  This License Agreement does not grant permission to use JDH
 trademarks or trade name in a trademark sense to endorse or promote
 products or services of Licensee, or any third party.
 
-8. By copying, installing or otherwise using matplotlib 1.2.0,
+8. By copying, installing or otherwise using matplotlib,
 Licensee agrees to be bound by the terms and conditions of this License
-Agreement.
+Agreement.
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
@@ -181,7 +181,7 @@ <h1>Open source</h1>
 
 <p>
 Please
-consider <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=X9T4KLZT2794S">donating
+consider <a href="https://www.flipcause.com/widget/MjI1OA==">donating
 to the matplotlib project</a> through the Numfocus organization or to
 the <a href="http://numfocus.org/johnhunter/">John Hunter Technology Fellowship</a>.
 </p>

diff --git a/doc/conf.py b/doc/conf.py
@@ -118,7 +118,7 @@
 plot_formats = [('png', 80), ('hires.png', 200), ('pdf', 50)]
 
 # Subdirectories in 'examples/' directory of package and titles for gallery
-mpl_example_sections = (
+mpl_example_sections = [
     ('lines_bars_and_markers', 'Lines, bars, and markers'),
     ('shapes_and_collections', 'Shapes and collections'),
     ('statistics', 'Statistical plots'),
@@ -138,7 +138,7 @@
     ('axes_grid', 'axes_grid toolkit'),
     ('units', 'units'),
     ('widgets', 'widgets'),
-    )
+    ]
 
 
 # Github extension

diff --git a/doc/faq/howto_faq.rst b/doc/faq/howto_faq.rst
@@ -632,11 +632,12 @@ or by saving to a file handle::
     fig.savefig(sys.stdout)
 
 Here is an example using `Pillow <http://python-imaging.github.io/>`_.
-First, the figure is saved to a StringIO object which is then fed to
+First, the figure is saved to a BytesIO object which is then fed to
 Pillow for further processing::
 
-    import StringIO, Image
-    imgdata = StringIO.StringIO()
+    from io import BytesIO
+    from PIL import Image
+    imgdata = BytesIO()
     fig.savefig(imgdata, format='png')
     imgdata.seek(0)  # rewind the data
     im = Image.open(imgdata)

diff --git a/doc/faq/usage_faq.rst b/doc/faq/usage_faq.rst
@@ -522,7 +522,9 @@ and turned off via :func:`matplotlib.pyplot.ioff`.
 
 .. note::
    Interactive mode works with suitable backends in ipython and in
-   the ordinary python shell, but it does *not* work in the IDLE IDE.
+   the ordinary python shell, but it does *not* work in the IDLE IDE. 
+   If the default backend does not support interactivity, an interactive 
+   backend can be explicitly activated using any of the methods discussed in `What is a backend?`_.
 
 
 Interactive example
@@ -545,9 +547,8 @@ can type additional commands such as::
 
 and you will see the plot being updated after each line.  This is
 because you are in interactive mode *and* you are using pyplot
-functions.  Now try an alternative method of modifying the
-plot.  Get a
-reference to the :class:`~matplotlib.axes.Axes` instance, and
+functions. Now try an alternative method of modifying the
+plot.  Get a reference to the :class:`~matplotlib.axes.Axes` instance, and
 call a method of that instance::
 
     ax = plt.gca()

diff --git a/doc/pyplots/make.py b/doc/pyplots/make.py
diff --git a/doc/pyplots/plotmap.hires.png b/doc/pyplots/plotmap.hires.png
diff --git a/doc/pyplots/plotmap.pdf b/doc/pyplots/plotmap.pdf
diff --git a/doc/pyplots/plotmap.png b/doc/pyplots/plotmap.png
diff --git a/doc/pyplots/tex_demo.hires.png b/doc/pyplots/tex_demo.hires.png
diff --git a/doc/pyplots/tex_demo.pdf b/doc/pyplots/tex_demo.pdf
diff --git a/doc/pyplots/tex_unicode_demo.hires.png b/doc/pyplots/tex_unicode_demo.hires.png
diff --git a/doc/pyplots/tex_unicode_demo.pdf b/doc/pyplots/tex_unicode_demo.pdf
diff --git a/doc/pyplots/tex_unicode_demo.png b/doc/pyplots/tex_unicode_demo.png
diff --git a/doc/users/style_sheets.rst b/doc/users/style_sheets.rst
@@ -18,7 +18,7 @@ just add::
 
 To list all available styles, use::
 
-   >>> print plt.style.available
+   >>> print(plt.style.available)
 
 
 Defining your own style
@@ -72,12 +72,11 @@ to change the global styling, the style package provides a context manager
 for limiting your changes to a specific scope. To isolate the your styling
 changes, you can write something like the following::
 
-
    >>> import numpy as np
    >>> import matplotlib.pyplot as plt
    >>>
    >>> with plt.style.context(('dark_background')):
-   >>>     plt.plot(np.sin(np.linspace(0, 2*np.pi)), 'r-o')
+   >>>     plt.plot(np.sin(np.linspace(0, 2 * np.pi)), 'r-o')
    >>>
    >>> # Some plotting code with the default style
    >>>

diff --git a/examples/misc/svg_filter_line.py b/examples/misc/svg_filter_line.py
@@ -51,9 +51,9 @@
 ax.set_xlim(0., 1.)
 ax.set_ylim(0., 1.)
 
-# save the figure as a string in the svg format.
-from io import StringIO
-f = StringIO()
+# save the figure as a bytes string in the svg format.
+from io import BytesIO
+f = BytesIO()
 plt.savefig(f, format="svg")
 
 

diff --git a/examples/misc/svg_filter_pie.py b/examples/misc/svg_filter_pie.py
@@ -42,8 +42,8 @@
 
 
 # save
-from io import StringIO
-f = StringIO()
+from io import BytesIO
+f = BytesIO()
 plt.savefig(f, format="svg")
 
 import xml.etree.cElementTree as ET

diff --git a/examples/user_interfaces/embedding_in_qt5.py b/examples/user_interfaces/embedding_in_qt5.py
@@ -17,7 +17,7 @@
 import matplotlib
 # Make sure that we are using QT5
 matplotlib.use('Qt5Agg')
-from PyQt5 import QtGui, QtCore, QtWidgets
+from PyQt5 import QtCore, QtWidgets
 
 from numpy import arange, sin, pi
 from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
@@ -117,8 +117,8 @@ def closeEvent(self, ce):
         self.fileQuit()
 
     def about(self):
-        QtGui.QMessageBox.about(self, "About",
-                                """embedding_in_qt5.py example
+        QtWidgets.QMessageBox.about(self, "About",
+                                    """embedding_in_qt5.py example
 Copyright 2005 Florent Rougon, 2006 Darren Dale, 2015 Jens H Nielsen
 
 This program is a simple example of a Qt5 application embedding matplotlib

diff --git a/examples/user_interfaces/svg_histogram.py b/examples/user_interfaces/svg_histogram.py
@@ -35,7 +35,7 @@
 import numpy as np
 import matplotlib.pyplot as plt
 import xml.etree.ElementTree as ET
-from io import StringIO
+from io import BytesIO
 import json
 
 plt.rcParams['svg.embed_char_paths'] = 'none'
@@ -76,7 +76,7 @@
     t.set_gid('leg_text_%d' % i)
 
 # Save SVG in a fake file object.
-f = StringIO()
+f = BytesIO()
 plt.savefig(f, format="svg")
 
 # Create XML tree from the SVG file.

diff --git a/examples/user_interfaces/svg_tooltip.py b/examples/user_interfaces/svg_tooltip.py
@@ -24,7 +24,7 @@
 
 import matplotlib.pyplot as plt
 import xml.etree.ElementTree as ET
-from io import StringIO
+from io import BytesIO
 
 ET.register_namespace("", "http://www.w3.org/2000/svg")
 
@@ -72,7 +72,7 @@
 ax.set_ylim(-30, 30)
 ax.set_aspect('equal')
 
-f = StringIO()
+f = BytesIO()
 plt.savefig(f, format="svg")
 
 # --- Add interactivity ---

diff --git a/lib/matplotlib/sphinxext/mathmpl.py b/lib/matplotlib/sphinxext/mathmpl.py
@@ -87,16 +87,15 @@ def latex2html(node, source):
 
     return '<img src="%s/%s.png" %s%s/>' % (path, name, cls, style)
 
+
 def setup(app):
     setup.app = app
 
-    app.add_node(latex_math)
-    app.add_role('math', math_role)
-
     # Add visit/depart methods to HTML-Translator:
     def visit_latex_math_html(self, node):
         source = self.document.attributes['source']
         self.body.append(latex2html(node, source))
+
     def depart_latex_math_html(self, node):
         pass
 
@@ -109,13 +108,13 @@ def visit_latex_math_latex(self, node):
             self.body.extend(['\\begin{equation}',
                               node['latex'],
                               '\\end{equation}'])
+
     def depart_latex_math_latex(self, node):
         pass
 
-    app.add_node(latex_math, html=(visit_latex_math_html,
-                                   depart_latex_math_html))
-    app.add_node(latex_math, latex=(visit_latex_math_latex,
-                                    depart_latex_math_latex))
+    app.add_node(latex_math,
+                 html=(visit_latex_math_html, depart_latex_math_html),
+                 latex=(visit_latex_math_latex, depart_latex_math_latex))
     app.add_role('math', math_role)
     app.add_directive('math', math_directive,
                       True, (0, 0, 0), **options_spec)