Skip to content

Commit

Permalink
Fixes for MEP27
Browse files Browse the repository at this point in the history
  • Loading branch information
OceanWolf committed Aug 4, 2016
1 parent a38b6d7 commit 64f0c61
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 2 additions & 0 deletions lib/matplotlib/_pylab_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions lib/matplotlib/backend_bases.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
3 changes: 2 additions & 1 deletion lib/matplotlib/backends/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/pyplot.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down

0 comments on commit 64f0c61

Please sign in to comment.