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

timhoffm · web-flow · commit f725924828e0 · 2019-12-17T21:04:03.000+01:00
Backport PR #15901 on branch v3.2.x (Update backend_nbagg for removal of Gcf._activeQue.)
diff --git a/lib/matplotlib/backends/backend_nbagg.py b/lib/matplotlib/backends/backend_nbagg.py
@@ -40,7 +40,7 @@ def connection_info():
         for manager in Gcf.get_all_fig_managers()
     ]
     if not is_interactive():
-        result.append('Figures pending show: {}'.format(len(Gcf._activeQue)))
+        result.append(f'Figures pending show: {len(Gcf.figs)}')
     return '\n'.join(result)
 
 
@@ -260,12 +260,12 @@ def show(*args, block=None, **kwargs):
         for manager in managers:
             manager.show()
 
-            # plt.figure adds an event which puts the figure in focus
-            # in the activeQue. Disable this behaviour, as it results in
+            # plt.figure adds an event which makes the figure in focus the
+            # active one. Disable this behaviour, as it results in
             # figures being put as the active figure after they have been
             # shown, even in non-interactive mode.
             if hasattr(manager, '_cidgcf'):
                 manager.canvas.mpl_disconnect(manager._cidgcf)
 
-            if not interactive and manager in Gcf._activeQue:
-                Gcf._activeQue.remove(manager)
+            if not interactive:
+                Gcf.figs.pop(manager.num, None)
