Fixes for MEP27

OceanWolf · OceanWolf · commit 64f0c61bd661 · 2016-08-04T02:03:35.000+02:00
diff --git a/lib/matplotlib/_pylab_helpers.py b/lib/matplotlib/_pylab_helpers.py
@@ -77,6 +77,8 @@ def show_all(cls, block=None):
             manager.show()
 
         if block is True:
+            # Start the mainloop on the last manager, so we don't have a
+            # mainloop starting for each manager. Not ideal, but works for now.
             manager._mainloop()
             return
         elif block is False:
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2350,15 +2350,15 @@ def get_window_title(self):
         Get the title text of the window containing the figure.
         Return None if there is no window (e.g., a PS backend).
         """
-        if getattr(self, "manager", None):
+        if self.manager is not None:
             return self.manager.get_window_title()
 
     def set_window_title(self, title):
         """
         Set the title text of the window containing the figure.  Note that
         this has no effect if there is no window (e.g., a PS backend).
         """
-        if getattr(self, "manager", None):
+        if self.manager is not None:
             self.manager.set_window_title(title)
 
     def get_default_filename(self):
diff --git a/lib/matplotlib/backends/__init__.py b/lib/matplotlib/backends/__init__.py
@@ -10,10 +10,11 @@
 
 backend = matplotlib.get_backend()
 
+
 def get_backend_name(name=None):
     '''converts the name of the backend into the module to load
     name : str, optional
-    
+
     Parameters
     ----------
         The name of the backend to use.  If `None`, falls back to
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -252,7 +252,7 @@ def show(*args, **kw):
     if rcParams['toolbar'] == 'toolmanager':
         return _pylab_helpers.Gcf.show_all(*args, **kw)
     else:
-        _show(*args, **kw)
+        return _show(*args, **kw)
 
 
 def isinteractive():
