Merge pull request #15738 from meeseeksmachine/auto-backport-of-pr-15737-on-v3.2.x

tacaswell · web-flow · commit 02ac55c08ebe · 2019-11-20T20:39:05.000-05:00
Backport PR #15737 on branch v3.2.x (Fix env override in WebAgg backend test.)
diff --git a/lib/matplotlib/tests/test_backend_webagg.py b/lib/matplotlib/tests/test_backend_webagg.py
@@ -8,11 +8,9 @@
 def test_webagg_fallback(backend):
     if backend == "nbagg":
         pytest.importorskip("IPython")
-    env = {}
-    if os.name == "nt":
-        env = dict(os.environ)
-    else:
-        env = {"DISPLAY": ""}
+    env = dict(os.environ)
+    if os.name != "nt":
+        env["DISPLAY"] = ""
 
     env["MPLBACKEND"] = backend
 
