Merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x

tacaswell · tacaswell · commit 8ec4455288d8 · 2016-01-07T21:27:40.000-05:00
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
@@ -89,8 +89,8 @@ <h1>John Hunter (1968-2012)</h1>
       If you have benefited from John's many contributions, please say
       thanks in the way that would matter most to him.  Please consider
       making a donation to
-      the <a href="http://numfocus.org/johnhunter/">John Hunter Memorial
-      Fund</a>.</p>
+      the <a href="http://numfocus.org/johnhunter/">John Hunter Technology
+      Fellowship</a>.</p>
     </td>
    </tr>
   </table>
diff --git a/examples/misc/svg_filter_line.py b/examples/misc/svg_filter_line.py
@@ -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 --git a/examples/misc/svg_filter_pie.py b/examples/misc/svg_filter_pie.py
@@ -42,7 +42,7 @@
 
 
 # save
-from StringIO import StringIO
+from io import StringIO
 f = StringIO()
 plt.savefig(f, format="svg")
 
diff --git a/examples/tests/backend_driver.py b/examples/tests/backend_driver.py
@@ -127,7 +127,6 @@
     'barcode_demo.py',
     'boxplot_demo.py',
     'broken_barh.py',
-    'clippedline.py',
     'cohere_demo.py',
     'color_by_yvalue.py',
     'color_demo.py',
diff --git a/examples/user_interfaces/embedding_in_tk_canvas.py b/examples/user_interfaces/embedding_in_tk_canvas.py
@@ -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 --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 StringIO import StringIO
+from io import StringIO
 import json
 
 plt.rcParams['svg.embed_char_paths'] = 'none'
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 StringIO import StringIO
+from io import StringIO
 
 ET.register_namespace("", "http://www.w3.org/2000/svg")
 
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
@@ -38,7 +38,7 @@
 from matplotlib.cbook import iterable, is_string_like
 from matplotlib.compat import subprocess
 from matplotlib import verbose
-from matplotlib import rcParams
+from matplotlib import rcParams, rcParamsDefault
 
 # Process creation flag for subprocess to prevent it raising a terminal
 # window. See for example:
@@ -267,6 +267,8 @@ def isAvailable(cls):
         Check to see if a MovieWriter subclass is actually available by
         running the commandline tool.
         '''
+        if not cls.bin_path():
+            return False
         try:
             p = subprocess.Popen(cls.bin_path(),
                              shell=False,
@@ -550,6 +552,27 @@ def delay(self):
     def output_args(self):
         return [self.outfile]
 
+    @classmethod
+    def _init_from_registry(cls):
+        if sys.platform != 'win32' or rcParams[cls.exec_key] != 'convert':
+            return
+        from matplotlib.externals.six.moves import winreg
+        for flag in (0, winreg.KEY_WOW64_32KEY, winreg.KEY_WOW64_64KEY):
+            try:
+                hkey = winreg.OpenKeyEx(winreg.HKEY_LOCAL_MACHINE,
+                                        'Software\\Imagemagick\\Current',
+                                        0, winreg.KEY_QUERY_VALUE | flag)
+                binpath = winreg.QueryValueEx(hkey, 'BinPath')[0]
+                winreg.CloseKey(hkey)
+                binpath += '\\convert.exe'
+                break
+            except Exception:
+                binpath = ''
+        rcParams[cls.exec_key] = rcParamsDefault[cls.exec_key] = binpath
+
+
+ImageMagickBase._init_from_registry()
+
 
 @writers.register('imagemagick')
 class ImageMagickWriter(MovieWriter, ImageMagickBase):
diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -137,7 +137,7 @@ def _create_qApp():
                 if display is None or not re.search(':\d', display):
                     raise RuntimeError('Invalid DISPLAY variable')
 
-            qApp = QtWidgets.QApplication([six.text_type(" ")])
+            qApp = QtWidgets.QApplication([str(" ")])
             qApp.lastWindowClosed.connect(qApp.quit)
         else:
             qApp = app
diff --git a/tests.py b/tests.py
@@ -67,5 +67,6 @@ def run(extra_args):
         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)
