Decrease output when running pytest -s.

anntzer · anntzer · commit fa83f05e9466 · 2020-09-06T22:03:47.000+02:00
The explicit cleanup() animation tmpdir on teardown avoids
emitting ResourceWarnings when running e.g. `pytest
lib/matplotlib/tests/test_animation.py -s`.

The call to print in test_text is unneeded.  The one in test_pylab
doesn't actually print normally, but I simplified the test while at it.
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
@@ -441,6 +441,10 @@ def setup(self, fig, outfile, dpi=None, frame_prefix=None,
         self._temp_paths = list()
         self.fname_format_str = '%s%%07d.%s'
 
+    def __del__(self):
+        if self._tmpdir:
+            self._tmpdir.cleanup()
+
     @cbook.deprecated("3.3")
     @property
     def clear_temp(self):
diff --git a/lib/matplotlib/tests/test_basic.py b/lib/matplotlib/tests/test_basic.py
@@ -11,7 +11,6 @@ def test_simple():
 
 def test_override_builtins():
     import pylab
-
     ok_to_override = {
         '__name__',
         '__doc__',
@@ -23,15 +22,9 @@ def test_override_builtins():
         'sum',
         'divmod'
     }
-    overridden = False
-    for key in dir(pylab):
-        if key in dir(builtins):
-            if (getattr(pylab, key) != getattr(builtins, key) and
-                    key not in ok_to_override):
-                print("'%s' was overridden in globals()." % key)
-                overridden = True
-
-    assert not overridden
+    overridden = {key for key in {*dir(pylab)} & {*dir(builtins)}
+                  if getattr(pylab, key) != getattr(builtins, key)}
+    assert overridden <= ok_to_override
 
 
 def test_lazy_imports():
diff --git a/lib/matplotlib/tests/test_text.py b/lib/matplotlib/tests/test_text.py
@@ -599,8 +599,7 @@ def test_text_as_text_opacity():
 def test_text_repr():
     # smoketest to make sure text repr doesn't error for category
     plt.plot(['A', 'B'], [1, 2])
-    txt = plt.text(['A'], 0.5, 'Boo')
-    print(txt)
+    repr(plt.text(['A'], 0.5, 'Boo'))
 
 
 def test_annotation_update():
