Merge pull request #10090 from anntzer/pylab_helpers

dopplershift · web-flow · commit 45ebc857a43b · 2017-12-28T16:02:43.000-06:00
Minor simplification to _pylab_helpers.
diff --git a/lib/matplotlib/_pylab_helpers.py b/lib/matplotlib/_pylab_helpers.py
@@ -5,13 +5,10 @@
                         unicode_literals)
 
 import six
-import sys
-import gc
-import atexit
 
-
-def error_msg(msg):
-    print(msg, file=sys.stderr)
+import atexit
+import gc
+import sys
 
 
 class Gcf(object):
@@ -58,27 +55,16 @@ def destroy(cls, num):
             return
         manager = cls.figs[num]
         manager.canvas.mpl_disconnect(manager._cidgcf)
-
-        # There must be a good reason for the following careful
-        # rebuilding of the activeQue; what is it?
-        oldQue = cls._activeQue[:]
-        cls._activeQue = []
-        for f in oldQue:
-            if f != manager:
-                cls._activeQue.append(f)
-
+        cls._activeQue.remove(manager)
         del cls.figs[num]
         manager.destroy()
         gc.collect(1)
 
     @classmethod
     def destroy_fig(cls, fig):
         "*fig* is a Figure instance"
-        num = None
-        for manager in six.itervalues(cls.figs):
-            if manager.canvas.figure == fig:
-                num = manager.num
-                break
+        num = next((manager.num for manager in six.itervalues(cls.figs)
+                    if manager.canvas.figure == fig), None)
         if num is not None:
             cls.destroy(num)
 
