Merge pull request #14964 from meeseeksmachine/auto-backport-of-pr-14649-on-v2.2.x

tacaswell · web-flow · commit cb1983e8254b · 2019-08-08T09:06:58.000-04:00
Backport Python 3 fixes on branch v2.2.x
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -19,15 +19,15 @@ environment:
     # theoretically the CONDA_INSTALL_LOCN could be only two: one for 32bit,
     # one for 64bit because we construct envs anyway. But using one for the
     # right python version is hopefully making it fast due to package caching.
-    - PYTHON_VERSION: "2.7"
-      CONDA_INSTALL_LOCN: "C:\\Miniconda-x64"
-      TEST_ALL: "no"
     - PYTHON_VERSION: "3.5"
       CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
       TEST_ALL: "no"
     - PYTHON_VERSION: "3.6"
       CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
       TEST_ALL: "no"
+    - PYTHON_VERSION: "2.7"
+      CONDA_INSTALL_LOCN: "C:\\Miniconda-x64"
+      TEST_ALL: "no"
 
 # We always use a 64-bit machine, but can build x86 distributions
 # with the PYTHON_ARCH variable
@@ -53,6 +53,7 @@ install:
   - conda config --set show_channel_urls yes
   - conda config --prepend channels conda-forge
   # this is now the downloaded conda...
+  - activate
   - conda info -a
 
   # For building, use a new environment which only includes the requirements for mpl
diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
@@ -366,8 +366,11 @@ def test_subplots_shareax_loglabels():
 
 def test_savefig():
     fig = plt.figure()
-    msg = "savefig() takes 2 positional arguments but 3 were given"
-    with pytest.raises(TypeError, message=msg):
+    if sys.version_info[0] == 3:
+        msg = r"savefig\(\) takes 2 positional arguments but 3 were given"
+    else:
+        msg = r"savefig\(\) takes exactly 2 arguments \(3 given\)"
+    with pytest.raises(TypeError, match=msg):
         fig.savefig("fname1.png", "fname2.png")
 
 
