diff -Nru matplotlib-1.5.1~rc1/debian/changelog matplotlib-1.5.1/debian/changelog
--- matplotlib-1.5.1~rc1/debian/changelog	2016-03-20 10:02:35.000000000 +0000
+++ matplotlib-1.5.1/debian/changelog	2016-03-21 21:39:36.000000000 +0000
@@ -1,3 +1,25 @@
+matplotlib (1.5.1-1ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Build-depend on language-pack-en-base instead of locales-all.
+    - Closes LP: #1559761
+
+ -- Barry Warsaw <barry@ubuntu.com>  Mon, 21 Mar 2016 17:38:22 -0400
+
+matplotlib (1.5.1-1) unstable; urgency=medium
+
+  [ Julian Taylor ]
+  * debian/tests/control: test against wxWidgets 3.0
+    - remove -dbg packages from wxagg test, not available anymore
+
+  [ Sandro Tosi ]
+  * New upstream release
+  * debian/control
+    - add ffmpeg to Suggests, Required for the animation module to be save out
+      put to movie formats
+
+ -- Sandro Tosi <morph@debian.org>  Sun, 07 Feb 2016 19:36:29 +0000
+
 matplotlib (1.5.1~rc1-1ubuntu3) xenial; urgency=medium
 
   * (cherry pick from Debian) Drop dbg packages from wxagg test deps,
@@ -998,7 +1020,7 @@
     * Depend on python-tz, remove the pytz files. Closes: #376715.
   
  -- Matthias Klose <doko@debian.org>  Fri,  7 Jul 2006 18:38:43 +0000
-  
+
 matplotlib (0.86.2-6) unstable; urgency=low
 
   * Added a note about numeric/numarray deps in README.debian. Closes: #376198
diff -Nru matplotlib-1.5.1~rc1/debian/control matplotlib-1.5.1/debian/control
--- matplotlib-1.5.1~rc1/debian/control	2016-03-20 09:58:48.000000000 +0000
+++ matplotlib-1.5.1/debian/control	2016-03-20 22:41:10.000000000 +0000
@@ -95,6 +95,7 @@
             python-tk (>= 2.5.2-1.1)
 Enhances: ipython
 Suggests: dvipng,
+          ffmpeg,
           gir1.2-gtk-3.0,
           ghostscript,
           inkscape,
@@ -139,6 +140,7 @@
             python3-tk
 Enhances: ipython3
 Suggests: dvipng,
+          ffmpeg,
           gir1.2-gtk-3.0,
           ghostscript,
           inkscape,
diff -Nru matplotlib-1.5.1~rc1/debian/.git-dpm matplotlib-1.5.1/debian/.git-dpm
--- matplotlib-1.5.1~rc1/debian/.git-dpm	2016-01-09 18:46:00.000000000 +0000
+++ matplotlib-1.5.1/debian/.git-dpm	2016-03-20 22:41:11.000000000 +0000
@@ -1,11 +1,11 @@
 # see git-dpm(1) from git-dpm package
-6e26b84f9c1de9ac768f94070d36ae381af20bda
-6e26b84f9c1de9ac768f94070d36ae381af20bda
-6d82424219d3a4cd0abb56028b7aefe94074d759
-6d82424219d3a4cd0abb56028b7aefe94074d759
-matplotlib_1.5.1~rc1.orig.tar.gz
-0876ac5b477c2018ec808ff8b177b5fffa88bfff
-53376942
+cd9e4deee40f7ad808664b115c382b176b5b9036
+cd9e4deee40f7ad808664b115c382b176b5b9036
+0ef98e60d02b0531d7a73a18c4af0ef0adf2a3ce
+0ef98e60d02b0531d7a73a18c4af0ef0adf2a3ce
+matplotlib_1.5.1.orig.tar.gz
+7a2e307bb9898893d4ff38f8f129cfa9dfe5ac92
+53375325
 debianTag="debian/%e%v"
 patchedTag="patched/%e%v"
 upstreamTag="upstream/%e%u"
diff -Nru matplotlib-1.5.1~rc1/debian/patches/0005-bts800803-disable-the-GitHub-Fork-Me-ribbon.patch matplotlib-1.5.1/debian/patches/0005-bts800803-disable-the-GitHub-Fork-Me-ribbon.patch
--- matplotlib-1.5.1~rc1/debian/patches/0005-bts800803-disable-the-GitHub-Fork-Me-ribbon.patch	2016-01-09 18:46:00.000000000 +0000
+++ matplotlib-1.5.1/debian/patches/0005-bts800803-disable-the-GitHub-Fork-Me-ribbon.patch	2016-03-20 22:41:11.000000000 +0000
@@ -1,4 +1,4 @@
-From 0131130ce28b1525341bd86c487112ba6560c7cc Mon Sep 17 00:00:00 2001
+From 74ae8c3f8154334cafd4a295297717a8b1ff1e55 Mon Sep 17 00:00:00 2001
 From: Sandro Tosi <morph@debian.org>
 Date: Sat, 9 Jan 2016 15:49:51 +0000
 Subject: bts800803 disable the GitHub Fork Me ribbon
@@ -8,10 +8,10 @@
  1 file changed, 6 deletions(-)
 
 diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
-index cb193d0..70f1b99 100644
+index 0a72bb0..9584bcb 100644
 --- a/doc/_templates/layout.html
 +++ b/doc/_templates/layout.html
-@@ -188,12 +188,6 @@ color: #11557C;">new updates</a></p>
+@@ -171,12 +171,6 @@ color: #11557C;">new updates</a></p>
  
  <link rel="shortcut icon" href="/_static/favicon.ico">
  
diff -Nru matplotlib-1.5.1~rc1/debian/patches/0006-bts800803-dont-use-the-Raleway-font-from-the-Google-.patch matplotlib-1.5.1/debian/patches/0006-bts800803-dont-use-the-Raleway-font-from-the-Google-.patch
--- matplotlib-1.5.1~rc1/debian/patches/0006-bts800803-dont-use-the-Raleway-font-from-the-Google-.patch	2016-01-09 18:46:00.000000000 +0000
+++ matplotlib-1.5.1/debian/patches/0006-bts800803-dont-use-the-Raleway-font-from-the-Google-.patch	2016-03-20 22:41:11.000000000 +0000
@@ -1,4 +1,4 @@
-From 94e09e2cb6d51f4a9ef77d76b95586744de1b6a4 Mon Sep 17 00:00:00 2001
+From 50f3ffa36218b176be6d9625ddc3e296255b422c Mon Sep 17 00:00:00 2001
 From: Sandro Tosi <morph@debian.org>
 Date: Sat, 9 Jan 2016 16:03:45 +0000
 Subject: bts800803 dont use the Raleway font (from the Google Fonts API)
@@ -8,14 +8,14 @@
  1 file changed, 1 deletion(-)
 
 diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
-index 70f1b99..e17db11 100644
+index 9584bcb..27ddde0 100644
 --- a/doc/_templates/layout.html
 +++ b/doc/_templates/layout.html
-@@ -170,7 +170,6 @@ parents[-1].link|e }}" />
-     {%- endif %}
+@@ -154,7 +154,6 @@ parents[-1].link|e }}" />
  {%- endblock %}
  {%- block extrahead %} {% endblock %}
--<link href="http://fonts.googleapis.com/css?family=Raleway" rel="stylesheet" type="text/css">
  
+-
    </head>
    <body>
+     <div class="alert" style="background-color: #FEA46C; padding: 10px 0;
diff -Nru matplotlib-1.5.1~rc1/debian/patches/0007-bts800803-remote-the-Google-Analytics-tracking.patch matplotlib-1.5.1/debian/patches/0007-bts800803-remote-the-Google-Analytics-tracking.patch
--- matplotlib-1.5.1~rc1/debian/patches/0007-bts800803-remote-the-Google-Analytics-tracking.patch	2016-01-09 18:46:00.000000000 +0000
+++ matplotlib-1.5.1/debian/patches/0007-bts800803-remote-the-Google-Analytics-tracking.patch	2016-03-20 22:41:11.000000000 +0000
@@ -1,4 +1,4 @@
-From 6e26b84f9c1de9ac768f94070d36ae381af20bda Mon Sep 17 00:00:00 2001
+From cd9e4deee40f7ad808664b115c382b176b5b9036 Mon Sep 17 00:00:00 2001
 From: Sandro Tosi <morph@debian.org>
 Date: Sat, 9 Jan 2016 16:51:28 +0000
 Subject: bts800803 remote the Google Analytics tracking
@@ -8,10 +8,10 @@
  1 file changed, 10 deletions(-)
 
 diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
-index e17db11..d653f22 100644
+index 27ddde0..ee0d399 100644
 --- a/doc/_templates/layout.html
 +++ b/doc/_templates/layout.html
-@@ -248,15 +248,5 @@ href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
+@@ -231,16 +231,6 @@ href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
      </div>
   {%- endblock %}
  
@@ -26,4 +26,5 @@
 -
 -</script>
  </body>
- </html>
+ <footer>
+   <!--Flipcause Integration v3.0// Flipcause Integration Instructions:
diff -Nru matplotlib-1.5.1~rc1/debian/patches/20_matplotlibrc_path_search_fix.patch matplotlib-1.5.1/debian/patches/20_matplotlibrc_path_search_fix.patch
--- matplotlib-1.5.1~rc1/debian/patches/20_matplotlibrc_path_search_fix.patch	2016-01-09 18:46:00.000000000 +0000
+++ matplotlib-1.5.1/debian/patches/20_matplotlibrc_path_search_fix.patch	2016-03-20 22:41:11.000000000 +0000
@@ -1,4 +1,4 @@
-From fe8da3bfd9b22ee0ed19fa3894fd4f54011aefff Mon Sep 17 00:00:00 2001
+From 8e7640243d4024d16af51029b8144cbf085fae11 Mon Sep 17 00:00:00 2001
 From: Sandro Tosi <morph@debian.org>
 Date: Thu, 8 Oct 2015 09:47:11 -0700
 Subject: Fixes the path to search for matplotlibrc file
diff -Nru matplotlib-1.5.1~rc1/debian/patches/70_bts720549_try_StayPuft_for_xkcd.patch matplotlib-1.5.1/debian/patches/70_bts720549_try_StayPuft_for_xkcd.patch
--- matplotlib-1.5.1~rc1/debian/patches/70_bts720549_try_StayPuft_for_xkcd.patch	2016-01-09 18:46:00.000000000 +0000
+++ matplotlib-1.5.1/debian/patches/70_bts720549_try_StayPuft_for_xkcd.patch	2016-03-20 22:41:11.000000000 +0000
@@ -1,4 +1,4 @@
-From 17d2a33799cdc94743f46a697059dcdf16cd9ffc Mon Sep 17 00:00:00 2001
+From 737d18f1e151425aaba740a126fd9cfee32d3558 Mon Sep 17 00:00:00 2001
 From: Sandro Tosi <morph@debian.org>
 Date: Thu, 8 Oct 2015 09:47:14 -0700
 Subject: Try to use also StayPuft (a free font) for xkcd
diff -Nru matplotlib-1.5.1~rc1/debian/patches/gtk3cairo_check_no-multiprocessing.patch matplotlib-1.5.1/debian/patches/gtk3cairo_check_no-multiprocessing.patch
--- matplotlib-1.5.1~rc1/debian/patches/gtk3cairo_check_no-multiprocessing.patch	2016-01-09 18:46:00.000000000 +0000
+++ matplotlib-1.5.1/debian/patches/gtk3cairo_check_no-multiprocessing.patch	2016-03-20 22:41:11.000000000 +0000
@@ -1,4 +1,4 @@
-From 304fe1390bfcdbc87c384a272ee940224e508769 Mon Sep 17 00:00:00 2001
+From 94f8c63bbec08414c4cb2b957415af8b78835884 Mon Sep 17 00:00:00 2001
 From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
 Date: Thu, 8 Oct 2015 09:47:16 -0700
 Subject: gtk3cairo_check_no-multiprocessing
diff -Nru matplotlib-1.5.1~rc1/debian/patches/multiarch-tktcl.patch matplotlib-1.5.1/debian/patches/multiarch-tktcl.patch
--- matplotlib-1.5.1~rc1/debian/patches/multiarch-tktcl.patch	2016-01-09 18:46:00.000000000 +0000
+++ matplotlib-1.5.1/debian/patches/multiarch-tktcl.patch	2016-03-20 22:41:11.000000000 +0000
@@ -1,4 +1,4 @@
-From 53b06669981f333dd7ddd1278d3d1d8d64b42635 Mon Sep 17 00:00:00 2001
+From e3fad4a8a7e61f67e29f3ad2061499f3300322cf Mon Sep 17 00:00:00 2001
 From: Julian Taylor <jtaylor@ubuntu.com>
 Date: Thu, 8 Oct 2015 09:47:15 -0700
 Subject: adapt setup to find multiarched tk/tcl
diff -Nru matplotlib-1.5.1~rc1/debian/tests/wxagg matplotlib-1.5.1/debian/tests/wxagg
--- matplotlib-1.5.1~rc1/debian/tests/wxagg	2016-01-09 18:46:00.000000000 +0000
+++ matplotlib-1.5.1/debian/tests/wxagg	2016-03-20 22:41:11.000000000 +0000
@@ -3,5 +3,5 @@
 
 pys="$(pyversions -r 2>/dev/null)"
 
-# todo check why debug fails
+# no dbg package in 3.0.2.0+dfsg-1
 BACKEND="WXAgg" pys=$pys DEBUG=no debian/tests/backend-base 2>&1
diff -Nru matplotlib-1.5.1~rc1/doc/conf.py matplotlib-1.5.1/doc/conf.py
--- matplotlib-1.5.1~rc1/doc/conf.py	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/doc/conf.py	2016-01-10 22:20:20.000000000 +0000
@@ -186,9 +186,12 @@
 #html_sidebars = {}
 
 # Custom sidebar templates, maps page names to templates.
-html_sidebars = {'index': 'indexsidebar.html',
-                 }
-
+html_sidebars = {
+    'index': ['badgesidebar.html','donate_sidebar.html',
+              'indexsidebar.html', 'searchbox.html'],
+    '**': ['badgesidebar.html', 'localtoc.html',
+           'relations.html', 'sourcelink.html', 'searchbox.html']
+}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
diff -Nru matplotlib-1.5.1~rc1/doc/faq/usage_faq.rst matplotlib-1.5.1/doc/faq/usage_faq.rst
--- matplotlib-1.5.1~rc1/doc/faq/usage_faq.rst	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/doc/faq/usage_faq.rst	2016-01-10 22:20:20.000000000 +0000
@@ -417,14 +417,16 @@
 ============   ================================================================
 Backend        Description
 ============   ================================================================
-GTKAgg         Agg rendering to a :term:`GTK` 2.x canvas (requires PyGTK_)
-GTK3Agg        Agg rendering to a :term:`GTK` 3.x canvas (requires PyGObject_)
+GTKAgg         Agg rendering to a :term:`GTK` 2.x canvas (requires PyGTK_ and
+               pycairo_ or cairocffi_; Python2 only)
+GTK3Agg        Agg rendering to a :term:`GTK` 3.x canvas (requires PyGObject_
+               and pycairo_ or cairocffi_)
 GTK            GDK rendering to a :term:`GTK` 2.x canvas (not recommended)
-               (requires PyGTK_)
+               (requires PyGTK_ and pycairo_ or cairocffi_; Python2 only)
 GTKCairo       Cairo rendering to a :term:`GTK` 2.x canvas (requires PyGTK_
-               and pycairo_)
+               and pycairo_ or cairocffi_; Python2 only)
 GTK3Cairo      Cairo rendering to a :term:`GTK` 3.x canvas (requires PyGObject_
-               and pycairo_)
+               and pycairo_ or cairocffi_)
 WXAgg          Agg rendering to to a :term:`wxWidgets` canvas
                (requires wxPython_)
 WX             Native :term:`wxWidgets` drawing to a :term:`wxWidgets` Canvas
@@ -446,11 +448,31 @@
 .. _PyGTK: http://www.pygtk.org
 .. _PyGObject: https://live.gnome.org/PyGObject
 .. _pycairo: http://www.cairographics.org/pycairo/
+.. _cairocffi: https://pythonhosted.org/cairocffi/
 .. _wxPython: http://www.wxpython.org/
 .. _TkInter: http://wiki.python.org/moin/TkInter
 .. _PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro
 .. _PyQt5: http://www.riverbankcomputing.co.uk/software/pyqt/intro
 
+WX backends
+===========
+
+At present the release version of `wxPython` (also known as wxPython classic)
+does not support python3. A work in progress redesigned version known as
+wxPython-Phoenix_ does support python3.
+Matplotlib should work with both versions.
+
+.. _wxPython-Phoenix: http://wxpython.org/Phoenix/docs/html/main.html
+
+GTK and Cairo
+=============
+
+Both `GTK2` and `GTK3` have implicit dependencies on PyCairo regardless of the
+specific Matplotlib backend used. Unfortunatly the latest release of PyCairo
+for Python3 does not implement the Python wrappers needed for the `GTK3Agg`
+backend. `Cairocffi` can be used as a replacement which implements the correct
+wrapper.
+
 How do I select PyQt4 or PySide?
 ========================================
 
diff -Nru matplotlib-1.5.1~rc1/doc/mpl_examples/misc/svg_filter_line.py matplotlib-1.5.1/doc/mpl_examples/misc/svg_filter_line.py
--- matplotlib-1.5.1~rc1/doc/mpl_examples/misc/svg_filter_line.py	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/doc/mpl_examples/misc/svg_filter_line.py	2016-01-10 22:20:20.000000000 +0000
@@ -52,7 +52,7 @@
 ax.set_ylim(0., 1.)
 
 # save the figure as a string in the svg format.
-from StringIO import StringIO
+from io import StringIO
 f = StringIO()
 plt.savefig(f, format="svg")
 
diff -Nru matplotlib-1.5.1~rc1/doc/mpl_examples/misc/svg_filter_pie.py matplotlib-1.5.1/doc/mpl_examples/misc/svg_filter_pie.py
--- matplotlib-1.5.1~rc1/doc/mpl_examples/misc/svg_filter_pie.py	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/doc/mpl_examples/misc/svg_filter_pie.py	2016-01-10 22:20:20.000000000 +0000
@@ -42,7 +42,7 @@
 
 
 # save
-from StringIO import StringIO
+from io import StringIO
 f = StringIO()
 plt.savefig(f, format="svg")
 
diff -Nru matplotlib-1.5.1~rc1/doc/mpl_examples/user_interfaces/embedding_in_tk_canvas.py matplotlib-1.5.1/doc/mpl_examples/user_interfaces/embedding_in_tk_canvas.py
--- matplotlib-1.5.1~rc1/doc/mpl_examples/user_interfaces/embedding_in_tk_canvas.py	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/doc/mpl_examples/user_interfaces/embedding_in_tk_canvas.py	2016-01-10 22:20:20.000000000 +0000
@@ -3,7 +3,11 @@
 
 import matplotlib as mpl
 import numpy as np
-import Tkinter as tk
+import sys
+if sys.version_info[0] < 3:
+    import Tkinter as tk
+else:
+    import tkinter as tk
 import matplotlib.backends.tkagg as tkagg
 from matplotlib.backends.backend_agg import FigureCanvasAgg
 
diff -Nru matplotlib-1.5.1~rc1/doc/mpl_examples/user_interfaces/svg_histogram.py matplotlib-1.5.1/doc/mpl_examples/user_interfaces/svg_histogram.py
--- matplotlib-1.5.1~rc1/doc/mpl_examples/user_interfaces/svg_histogram.py	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/doc/mpl_examples/user_interfaces/svg_histogram.py	2016-01-10 22:20:20.000000000 +0000
@@ -35,7 +35,7 @@
 import numpy as np
 import matplotlib.pyplot as plt
 import xml.etree.ElementTree as ET
-from StringIO import StringIO
+from io import StringIO
 import json
 
 plt.rcParams['svg.embed_char_paths'] = 'none'
diff -Nru matplotlib-1.5.1~rc1/doc/mpl_examples/user_interfaces/svg_tooltip.py matplotlib-1.5.1/doc/mpl_examples/user_interfaces/svg_tooltip.py
--- matplotlib-1.5.1~rc1/doc/mpl_examples/user_interfaces/svg_tooltip.py	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/doc/mpl_examples/user_interfaces/svg_tooltip.py	2016-01-10 22:20:20.000000000 +0000
@@ -24,7 +24,7 @@
 
 import matplotlib.pyplot as plt
 import xml.etree.ElementTree as ET
-from StringIO import StringIO
+from io import StringIO
 
 ET.register_namespace("", "http://www.w3.org/2000/svg")
 
diff -Nru matplotlib-1.5.1~rc1/doc/_static/mpl.css matplotlib-1.5.1/doc/_static/mpl.css
--- matplotlib-1.5.1~rc1/doc/_static/mpl.css	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/doc/_static/mpl.css	2016-01-10 22:20:20.000000000 +0000
@@ -223,6 +223,9 @@
     text-align: left;
 /*    margin-left: -100%; */
 }
+div.sphinxsidebarwrapper {
+    padding-top: 28px
+}
 
 div.sphinxsidebar h4, div.sphinxsidebar h3 {
     margin: 1em 0 0.5em 0;
@@ -650,3 +653,32 @@
 }
 
 
+.donate_button {
+    background:#11557C;
+    font-weight:normal;
+    border:solid 1px #fff;
+    outline: solid 1px #11557C;
+    clear: both;
+    display: block;
+    width:200px;
+    line-height:2.8;
+    font-size: 16px;
+    text-align: center;
+    cursor:pointer;
+    color:#fff;
+    text-decoration: none;
+    margin: 30px auto 0;
+    z-index:1;
+    transition: background .25s ease;
+}
+
+.donate_button:last-of-type {
+    margin: 15px auto 30px;
+
+
+}
+
+.donate_button:hover, .donate_button:active, .donate_button:focus {
+    background: #003c63;
+    outline-color: #003c63;
+}
diff -Nru matplotlib-1.5.1~rc1/doc/_templates/badgesidebar.html matplotlib-1.5.1/doc/_templates/badgesidebar.html
--- matplotlib-1.5.1~rc1/doc/_templates/badgesidebar.html	1970-01-01 00:00:00.000000000 +0000
+++ matplotlib-1.5.1/doc/_templates/badgesidebar.html	2016-01-10 22:20:20.000000000 +0000
@@ -0,0 +1,11 @@
+
+<a href="http://depsy.org/package/python/matplotlib">
+  <img src="http://depsy.org/api/package/pypi/matplotlib/badge.svg">
+</a>
+
+<br/>
+
+Travis-CI: <a href="https://travis-ci.org/matplotlib/matplotlib">
+  <img src="https://travis-ci.org/matplotlib/matplotlib.svg?branch=master"/>
+</a>
+<br/>
diff -Nru matplotlib-1.5.1~rc1/doc/_templates/donate_sidebar.html matplotlib-1.5.1/doc/_templates/donate_sidebar.html
--- matplotlib-1.5.1~rc1/doc/_templates/donate_sidebar.html	1970-01-01 00:00:00.000000000 +0000
+++ matplotlib-1.5.1/doc/_templates/donate_sidebar.html	2016-01-10 22:20:20.000000000 +0000
@@ -0,0 +1,5 @@
+
+<div>
+<div onclick="open_window('MjI1OA==')" class="donate_button">Support matplotlib</div>
+<div onclick="open_window('MjM2OA==')" class="donate_button">Support NumFOCUS</div>
+</div>
diff -Nru matplotlib-1.5.1~rc1/doc/_templates/index.html matplotlib-1.5.1/doc/_templates/index.html
--- matplotlib-1.5.1~rc1/doc/_templates/index.html	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/doc/_templates/index.html	2016-01-10 22:20:20.000000000 +0000
@@ -181,8 +181,7 @@
 Please
 consider <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=X9T4KLZT2794S">donating
 to the matplotlib project</a> through the Numfocus organization or to
-the <a href="http://numfocus.org/johnhunter/">John Hunter Memorial
-Fund</a>.
+the <a href="http://numfocus.org/johnhunter/">John Hunter Technology Fellowship</a>.
 </p>
 
 <p>
@@ -195,6 +194,13 @@
 who have made significant <a href="{{ pathto('users/credits') }}">contributions</a>.
 </p>
 
+<p>
+Matplotlib is hosted on <a href="https://github.com/matplotlib/matplotlib">Github</a>.
+<a href="https://github.com/matplotlib/matplotlib/issues">Issues</a> and
+<a href="https://github.com/matplotlib/matplotlib/pulls">Pull requests</a>
+are tracked at Github too.
+</p>
+
 
 <div class="footnote"><p>
 <sup><a name="ftn.matlab" href="#matlab">*</a></sup>
diff -Nru matplotlib-1.5.1~rc1/doc/_templates/layout.html matplotlib-1.5.1/doc/_templates/layout.html
--- matplotlib-1.5.1~rc1/doc/_templates/layout.html	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/doc/_templates/layout.html	2016-01-10 22:20:20.000000000 +0000
@@ -69,23 +69,6 @@
             {%- for sidebartemplate in sidebars %}
             {%- include sidebartemplate %}
             {%- endfor %}
-          {%- else %}
-            {#- old style sidebars: using blocks -- should be deprecated #}
-            {%- block sidebartoc %}
-            {%- include "localtoc.html" %}
-            {%- endblock %}
-            {%- block sidebarrel %}
-            {%- include "relations.html" %}
-            {%- endblock %}
-            {%- block sidebarsourcelink %}
-            {%- include "sourcelink.html" %}
-            {%- endblock %}
-            {%- if customsidebar %}
-            {%- include customsidebar %}
-            {%- endif %}
-            {%- block sidebarsearch %}
-            {%- include "searchbox.html" %}
-            {%- endblock %}
           {%- endif %}
         </div>
       </div>
@@ -170,7 +153,7 @@
     {%- endif %}
 {%- endblock %}
 {%- block extrahead %} {% endblock %}
-<link href="http://fonts.googleapis.com/css?family=Raleway" rel="stylesheet" type="text/css">
+
 
   </head>
   <body>
@@ -266,4 +249,153 @@
 
 </script>
 </body>
+<footer>
+  <!--Flipcause Integration v3.0// Flipcause Integration Instructions:
+Install the following code block once in the website Header (after <head> tag) -->
+
+<style>
+
+.fc-black_overlay{
+display:none; position: fixed; z-index:1000001; top: 0%;left: 0%;width: 100%;height: 100%;
+background-color: black; filter: alpha(opacity=50); cursor:pointer; opacity:0.5;
+}
+
+.fc-white_content {
+opacity:1; display:none; margin-top: -320px; margin-left: -485px; width:970px; height:640px;
+position:fixed; top:50%; left:50%; border: none;z-index:1000002;overflow: auto;
+}
+
+.fc-main-box{
+opacity:1; display:none; margin:15px auto 0 auto; width:930px; position:relative; z-index:1000003;
+}
+
+.fc-widget_close{
+opacity:1; content:url(http://i1338.photobucket.com/albums/o691/WeCause/X_zpse4a7e538.png);
+position:absolute; z-index=1000004; right:-16px; top:-16px; display:block; cursor:pointer;
+}
+
+.floating_button{
+display: block; margin-top: 0px; margin-left: 0px; width:auto ; height: auto;
+position:fixed; z-index:999999; overflow: auto;
+}
+
+@keyframes backfadesin {
+   from { opacity:0; }
+   to {opacity:.5;}
+}
+
+@-moz-keyframes backfadesin {
+    from { opacity:0; }
+    to {opacity:.5;}
+}
+
+@-webkit-keyframes backfadesin {
+    from { opacity:0; }
+    to {opacity:.5;}
+}
+
+@-o-keyframes backfadesin {
+    from { opacity:0; }
+    to {opacity:.5;}
+}
+
+
+@-ms-keyframes backfadesin {
+    from { opacity:0; }
+    to {opacity:.5;}
+}
+
+@keyframes fadesin {
+   0%{ opacity:0; }
+   50%{ opacity:0; }
+   75% {opacity: 0; transform: translateY(20px);}
+   100% {opacity: 1; transform: translateY(0);}
+}
+
+@-moz-keyframes fadesin {
+   0%{ opacity:0; }
+   50%{ opacity:0; }
+   75% {opacity: 0; -moz-transform: translateY(20px);}
+   100% {opacity: 1; -moz-transform: translateY(0);}
+}
+
+@-webkit-keyframes fadesin {
+   0%{ opacity:0; }
+   50%{ opacity:0; }
+   75% {opacity: 0; -webkit-transform: translateY(20px);}
+   100% {opacity: 1; -webkit-transform: translateY(0);}
+}
+
+@-o-keyframes fadesin {
+   0%{ opacity:0; }
+   50%{ opacity:0; }
+   75% {opacity: 0; -o-transform: translateY(20px);}
+   100% {opacity: 1; -o-transform: translateY(0);}
+}
+
+@-ms-keyframes fadesin {
+   0%{ opacity:0; }
+   50%{ opacity:0; }
+   75% {opacity: 0; -ms-transform: translateY(20px);}
+   100% {opacity: 1; -ms-transform: translateY(0);}
+}
+
+</style>
+
+<script>
+
+function open_window(cause_id) {
+var  protocol=String(document.location.protocol);
+var new_url;
+if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)){
+new_url="https://www.flipcause.com/widget/"+cause_id
+window.open(new_url);
+}
+
+else {
+document.getElementById("fc-fade").style.display = "block";
+document.getElementById("fc-fade").style.webkitAnimation = "backfadesin 1s";
+document.getElementById("fc-fade").style.animation = "backfadesin 1s";
+document.getElementById("fc-fade").style.mozAnimation = "backfadesin 1s";
+document.getElementById("fc-light").style.display = "block";
+document.getElementById("fc-light").style.webkitAnimation = "fadesin 1.5s";
+document.getElementById("fc-light").style.animation = "fadesin 1.5s";
+document.getElementById("fc-light").style.mozAnimation = "fadesin 1.5s";
+document.getElementById("fc-main").style.display = "block";
+document.getElementById("fc-main").style.webkitAnimation = "fadesin 1.5s";
+document.getElementById("fc-main").style.animation = "fadesin 1.5s";
+document.getElementById("fc-main").style.mozAnimation = "fadesin 1.5s";
+document.getElementById("fc-close").style.display = "block";
+document.getElementById("fc-close").style.webkitAnimation = "fadesin 1.5s";
+document.getElementById("fc-close").style.animation = "fadesin 1.5s";
+document.getElementById("fc-close").style.mozAnimation = "fadesin 1.5s";
+document.getElementById("fc-myFrame").style.display = "block";
+document.getElementById("fc-myFrame").style.webkitAnimation = "fadesin 1.5s";
+document.getElementById("fc-myFrame").style.animation = "fadesin 1.5s";
+document.getElementById("fc-myFrame").style.mozAnimation = "fadesin 1.5s";
+document.getElementById("fc-myFrame").src="https://www.flipcause.com/widget/"+cause_id;
+}
+}
+
+
+function close_window() {
+document.getElementById("fc-fade").style.display="none";
+document.getElementById("fc-light").style.display="none";
+document.getElementById("fc-main").style.display="none";
+document.getElementById("fc-close").style.display="none";
+document.getElementById("fc-myFrame").style.display="none";
+}
+
+</script>
+
+<div id="fc-fade" class="fc-black_overlay" onclick="close_window()"></div>
+<div id="fc-light" class="fc-white_content">
+<div id="fc-main" class="fc-main-box">
+<div id="fc-close" class="fc-widget_close" onclick="close_window()">
+</div><iframe id="fc-myFrame" iframe height="580" width="925" style="border: 0;
+border-radius:5px 5px 5px 5px; box-shadow:0 0 8px rgba(0, 0, 0, 0.5);" scrolling="no" src=""></iframe></div>
+</div>
+
+<!--END Flipcause Main Integration Code-->
+</footer>
 </html>
diff -Nru matplotlib-1.5.1~rc1/examples/misc/svg_filter_line.py matplotlib-1.5.1/examples/misc/svg_filter_line.py
--- matplotlib-1.5.1~rc1/examples/misc/svg_filter_line.py	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/examples/misc/svg_filter_line.py	2016-01-10 22:20:20.000000000 +0000
@@ -52,7 +52,7 @@
 ax.set_ylim(0., 1.)
 
 # save the figure as a string in the svg format.
-from StringIO import StringIO
+from io import StringIO
 f = StringIO()
 plt.savefig(f, format="svg")
 
diff -Nru matplotlib-1.5.1~rc1/examples/misc/svg_filter_pie.py matplotlib-1.5.1/examples/misc/svg_filter_pie.py
--- matplotlib-1.5.1~rc1/examples/misc/svg_filter_pie.py	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/examples/misc/svg_filter_pie.py	2016-01-10 22:20:20.000000000 +0000
@@ -42,7 +42,7 @@
 
 
 # save
-from StringIO import StringIO
+from io import StringIO
 f = StringIO()
 plt.savefig(f, format="svg")
 
diff -Nru matplotlib-1.5.1~rc1/examples/user_interfaces/embedding_in_tk_canvas.py matplotlib-1.5.1/examples/user_interfaces/embedding_in_tk_canvas.py
--- matplotlib-1.5.1~rc1/examples/user_interfaces/embedding_in_tk_canvas.py	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/examples/user_interfaces/embedding_in_tk_canvas.py	2016-01-10 22:20:20.000000000 +0000
@@ -3,7 +3,11 @@
 
 import matplotlib as mpl
 import numpy as np
-import Tkinter as tk
+import sys
+if sys.version_info[0] < 3:
+    import Tkinter as tk
+else:
+    import tkinter as tk
 import matplotlib.backends.tkagg as tkagg
 from matplotlib.backends.backend_agg import FigureCanvasAgg
 
diff -Nru matplotlib-1.5.1~rc1/examples/user_interfaces/svg_histogram.py matplotlib-1.5.1/examples/user_interfaces/svg_histogram.py
--- matplotlib-1.5.1~rc1/examples/user_interfaces/svg_histogram.py	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/examples/user_interfaces/svg_histogram.py	2016-01-10 22:20:20.000000000 +0000
@@ -35,7 +35,7 @@
 import numpy as np
 import matplotlib.pyplot as plt
 import xml.etree.ElementTree as ET
-from StringIO import StringIO
+from io import StringIO
 import json
 
 plt.rcParams['svg.embed_char_paths'] = 'none'
diff -Nru matplotlib-1.5.1~rc1/examples/user_interfaces/svg_tooltip.py matplotlib-1.5.1/examples/user_interfaces/svg_tooltip.py
--- matplotlib-1.5.1~rc1/examples/user_interfaces/svg_tooltip.py	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/examples/user_interfaces/svg_tooltip.py	2016-01-10 22:20:20.000000000 +0000
@@ -24,7 +24,7 @@
 
 import matplotlib.pyplot as plt
 import xml.etree.ElementTree as ET
-from StringIO import StringIO
+from io import StringIO
 
 ET.register_namespace("", "http://www.w3.org/2000/svg")
 
diff -Nru matplotlib-1.5.1~rc1/INSTALL matplotlib-1.5.1/INSTALL
--- matplotlib-1.5.1~rc1/INSTALL	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/INSTALL	2016-01-10 22:20:20.000000000 +0000
@@ -190,28 +190,31 @@
 :term:`numpy` |minimum_numpy_version| (or later)
     array support for python (`download numpy <http://numpy.org>`_)
 
+`setuptools <http://pythonhosted.org/setuptools/>`__
+    Setuptools provides extensions for python package installation.
+
 :term:`dateutil` 1.1 or later
     Provides extensions to python datetime handling.  If using pip,
     easy_install or installing from source, the installer will attempt
     to download and install `python_dateutil` from PyPI.
 
-`pyparsing`
+`pyparsing <https://pyparsing.wikispaces.com/>`__
     Required for matplotlib's mathtext math rendering support.  If
     using pip, easy_install or installing from source, the installer
     will attempt to download and install `pyparsing` from PyPI.
 
-libpng 1.2 (or later)
+`libpng 1.2 (or later) <http://www.libpng.org>`__
     library for loading and saving :term:`PNG` files (`download
     <http://www.libpng.org/pub/png/libpng.html>`__). libpng requires
     zlib.
 
-`pytz`
-    Used to manipulate time-zone aware datetimes.
+`pytz <http://pytz.sourceforge.net/>`__
+    Used to manipulate time-zone aware datetimes. http://pypi.python.org/pypi/pytz
 
 :term:`freetype` 2.3 or later
     library for reading true type font files.
 
-``cycler`` 0.9 or later
+`cycler <http://matplotlib.org/cycler/>`__ 0.9 or later
    Composable cycle class used for constructing style-cycles
 
 
@@ -239,11 +242,11 @@
 
 Optional external programs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
-ffmpeg/avconv or mencoder
+`ffmpeg <https://www.ffmpeg.org/>`__/`avconv <https://libav.org/avconv.html>`__ or `mencoder <http://www.mplayerhq.hu/design7/news.html>`__
     Required for the animation module to be save out put to movie
     formats.
 
-ImageMagick
+`ImageMagick <http://www.imagemagick.org/>`__
     Required for the animation module to be able to save to animated gif.
 
 Optional dependencies
@@ -253,7 +256,7 @@
     If Pillow is installed, matplotlib can read and write a larger
     selection of image file formats.
 
-pkg-config
+`pkg-config <http://www.freedesktop.org/wiki/Software/pkg-config/>`__
     A tool used to find required non-python libraries.  This is not strictly
     required, but can make installation go more smoothly if the libraries and
     headers are not in the expected locations.
diff -Nru matplotlib-1.5.1~rc1/lib/matplotlib/artist.py matplotlib-1.5.1/lib/matplotlib/artist.py
--- matplotlib-1.5.1~rc1/lib/matplotlib/artist.py	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/lib/matplotlib/artist.py	2016-01-10 22:20:20.000000000 +0000
@@ -1094,7 +1094,7 @@
 
         match = self._get_valid_values_regex.search(docstring)
         if match is not None:
-            return match.group(1).replace('\n', ' ')
+            return re.sub("\n *", " ", match.group(1))
         return 'unknown'
 
     def _get_setters_and_targets(self):
diff -Nru matplotlib-1.5.1~rc1/lib/matplotlib/tests/test_image.py matplotlib-1.5.1/lib/matplotlib/tests/test_image.py
--- matplotlib-1.5.1~rc1/lib/matplotlib/tests/test_image.py	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/lib/matplotlib/tests/test_image.py	2016-01-10 22:20:20.000000000 +0000
@@ -2,26 +2,32 @@
                         unicode_literals)
 
 from matplotlib.externals import six
+import sys
+import io
+import os
 
 import numpy as np
 
-from matplotlib.testing.decorators import image_comparison, knownfailureif, cleanup
+from matplotlib.testing.decorators import (image_comparison,
+                                           knownfailureif, cleanup)
 from matplotlib.image import BboxImage, imread, NonUniformImage
 from matplotlib.transforms import Bbox
 from matplotlib import rcParams
 import matplotlib.pyplot as plt
-from nose.tools import assert_raises
-from numpy.testing import assert_array_equal, assert_array_almost_equal
 
-import io
-import os
+from numpy.testing import assert_array_equal
+
+
+import nose
 
 try:
     from PIL import Image
+    del Image
     HAS_PIL = True
 except ImportError:
     HAS_PIL = False
 
+
 @image_comparison(baseline_images=['image_interps'])
 def test_image_interps():
     'make the basic nearest, bilinear and bicubic interps'
@@ -447,12 +453,52 @@
     im = NonUniformImage(ax)
     im.set_cmap('Blues')
 
+
 @cleanup
 def test_nonuniformimage_setnorm():
     ax = plt.gca()
     im = NonUniformImage(ax)
     im.set_norm(plt.Normalize())
 
+
+@cleanup
+def test_minimized_rasterized():
+    # This ensures that the rasterized content in the colorbars is
+    # only as thick as the colorbar, and doesn't extend to other parts
+    # of the image.  See #5814.  While the original bug exists only
+    # in Postscript, the best way to detect it is to generate SVG
+    # and then parse the output to make sure the two colorbar images
+    # are the same size.
+    if sys.version_info[:2] < (2, 7):
+        raise nose.SkipTest("xml.etree.ElementTree.Element.iter "
+                            "added in py 2.7")
+
+    from xml.etree import ElementTree
+
+    np.random.seed(0)
+    data = np.random.rand(10, 10)
+
+    fig, ax = plt.subplots(1, 2)
+    p1 = ax[0].pcolormesh(data)
+    p2 = ax[1].pcolormesh(data)
+
+    plt.colorbar(p1, ax=ax[0])
+    plt.colorbar(p2, ax=ax[1])
+
+    buff = io.BytesIO()
+    plt.savefig(buff, format='svg')
+
+    buff = io.BytesIO(buff.getvalue())
+    tree = ElementTree.parse(buff)
+    width = None
+    for image in tree.iter('image'):
+        if width is None:
+            width = image['width']
+        else:
+            if image['width'] != width:
+                assert False
+
+
 if __name__=='__main__':
     import nose
     nose.runmodule(argv=['-s','--with-doctest'], exit=False)
diff -Nru matplotlib-1.5.1~rc1/lib/matplotlib/_version.py matplotlib-1.5.1/lib/matplotlib/_version.py
--- matplotlib-1.5.1~rc1/lib/matplotlib/_version.py	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/lib/matplotlib/_version.py	2016-01-10 22:20:20.000000000 +0000
@@ -20,8 +20,8 @@
     # setup.py/versioneer.py will grep for the variable names, so they must
     # each be defined on a line of their own. _version.py will just call
     # get_keywords().
-    git_refnames = " (tag: v1.5.1rc1, v1.5.x)"
-    git_full = "9d76fd4e92f00d7a314b4d601a540a0e2513dab3"
+    git_refnames = " (tag: v1.5.1)"
+    git_full = "be91fac9fa2b7250080557e723af75124659da4e"
     keywords = {"refnames": git_refnames, "full": git_full}
     return keywords
 
diff -Nru matplotlib-1.5.1~rc1/lib/mpl_examples/misc/svg_filter_line.py matplotlib-1.5.1/lib/mpl_examples/misc/svg_filter_line.py
--- matplotlib-1.5.1~rc1/lib/mpl_examples/misc/svg_filter_line.py	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/lib/mpl_examples/misc/svg_filter_line.py	2016-01-10 22:20:20.000000000 +0000
@@ -52,7 +52,7 @@
 ax.set_ylim(0., 1.)
 
 # save the figure as a string in the svg format.
-from StringIO import StringIO
+from io import StringIO
 f = StringIO()
 plt.savefig(f, format="svg")
 
diff -Nru matplotlib-1.5.1~rc1/lib/mpl_examples/misc/svg_filter_pie.py matplotlib-1.5.1/lib/mpl_examples/misc/svg_filter_pie.py
--- matplotlib-1.5.1~rc1/lib/mpl_examples/misc/svg_filter_pie.py	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/lib/mpl_examples/misc/svg_filter_pie.py	2016-01-10 22:20:20.000000000 +0000
@@ -42,7 +42,7 @@
 
 
 # save
-from StringIO import StringIO
+from io import StringIO
 f = StringIO()
 plt.savefig(f, format="svg")
 
diff -Nru matplotlib-1.5.1~rc1/lib/mpl_examples/user_interfaces/embedding_in_tk_canvas.py matplotlib-1.5.1/lib/mpl_examples/user_interfaces/embedding_in_tk_canvas.py
--- matplotlib-1.5.1~rc1/lib/mpl_examples/user_interfaces/embedding_in_tk_canvas.py	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/lib/mpl_examples/user_interfaces/embedding_in_tk_canvas.py	2016-01-10 22:20:20.000000000 +0000
@@ -3,7 +3,11 @@
 
 import matplotlib as mpl
 import numpy as np
-import Tkinter as tk
+import sys
+if sys.version_info[0] < 3:
+    import Tkinter as tk
+else:
+    import tkinter as tk
 import matplotlib.backends.tkagg as tkagg
 from matplotlib.backends.backend_agg import FigureCanvasAgg
 
diff -Nru matplotlib-1.5.1~rc1/lib/mpl_examples/user_interfaces/svg_histogram.py matplotlib-1.5.1/lib/mpl_examples/user_interfaces/svg_histogram.py
--- matplotlib-1.5.1~rc1/lib/mpl_examples/user_interfaces/svg_histogram.py	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/lib/mpl_examples/user_interfaces/svg_histogram.py	2016-01-10 22:20:20.000000000 +0000
@@ -35,7 +35,7 @@
 import numpy as np
 import matplotlib.pyplot as plt
 import xml.etree.ElementTree as ET
-from StringIO import StringIO
+from io import StringIO
 import json
 
 plt.rcParams['svg.embed_char_paths'] = 'none'
diff -Nru matplotlib-1.5.1~rc1/lib/mpl_examples/user_interfaces/svg_tooltip.py matplotlib-1.5.1/lib/mpl_examples/user_interfaces/svg_tooltip.py
--- matplotlib-1.5.1~rc1/lib/mpl_examples/user_interfaces/svg_tooltip.py	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/lib/mpl_examples/user_interfaces/svg_tooltip.py	2016-01-10 22:20:20.000000000 +0000
@@ -24,7 +24,7 @@
 
 import matplotlib.pyplot as plt
 import xml.etree.ElementTree as ET
-from StringIO import StringIO
+from io import StringIO
 
 ET.register_namespace("", "http://www.w3.org/2000/svg")
 
diff -Nru matplotlib-1.5.1~rc1/src/_backend_agg.cpp matplotlib-1.5.1/src/_backend_agg.cpp
--- matplotlib-1.5.1~rc1/src/_backend_agg.cpp	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/src/_backend_agg.cpp	2016-01-10 22:20:20.000000000 +0000
@@ -210,10 +210,10 @@
         }
     }
 
-    r.x1 = std::max(0, r.x1 - 1);
-    r.y1 = std::max(0, r.y1 - 1);
-    r.x2 = std::max(r.x2 + 1, (int)width);
-    r.y2 = std::max(r.y2 + 1, (int)height);
+    r.x1 = std::max(0, r.x1);
+    r.y1 = std::max(0, r.y1);
+    r.x2 = std::min(r.x2 + 1, (int)width);
+    r.y2 = std::min(r.y2 + 1, (int)height);
 
     return r;
 }
diff -Nru matplotlib-1.5.1~rc1/tests.py matplotlib-1.5.1/tests.py
--- matplotlib-1.5.1~rc1/tests.py	2016-01-02 21:38:46.000000000 +0000
+++ matplotlib-1.5.1/tests.py	2016-01-10 22:20:20.000000000 +0000
@@ -67,5 +67,6 @@
         from matplotlib.testing import disable_internet
         disable_internet.turn_off_internet()
         extra_args.extend(['--eval-attr="not network"'])
+        sys.argv.remove('--no-network')
 
     run(extra_args)