Skip to content

Commit f985fb1

Browse files
authored
Merge pull request matplotlib#22228 from anntzer/ungetattr
MNT: Remove some unnecessary getattrs.
2 parents 8837185 + 31a5d0d commit f985fb1

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

lib/matplotlib/figure.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2733,11 +2733,9 @@ def set_size_inches(self, w, h=None, forward=True):
27332733
raise ValueError(f'figure size must be positive finite not {size}')
27342734
self.bbox_inches.p1 = size
27352735
if forward:
2736-
canvas = getattr(self, 'canvas')
2737-
if canvas is not None:
2738-
manager = getattr(canvas, 'manager', None)
2739-
if manager is not None:
2740-
manager.resize(*(size * self.dpi).astype(int))
2736+
manager = self.canvas.manager
2737+
if manager is not None:
2738+
manager.resize(*(size * self.dpi).astype(int))
27412739
self.stale = True
27422740

27432741
def get_size_inches(self):
@@ -2832,7 +2830,7 @@ def clf(self, keep_observers=False):
28322830
ax.cla()
28332831
self.delaxes(ax) # Remove ax from self._axstack.
28342832

2835-
toolbar = getattr(self.canvas, 'toolbar', None)
2833+
toolbar = self.canvas.toolbar
28362834
if toolbar is not None:
28372835
toolbar.update()
28382836
self._axstack.clear()
@@ -2924,8 +2922,7 @@ def __getstate__(self):
29242922

29252923
# check whether the figure manager (if any) is registered with pyplot
29262924
from matplotlib import _pylab_helpers
2927-
if getattr(self.canvas, 'manager', None) \
2928-
in _pylab_helpers.Gcf.figs.values():
2925+
if self.canvas.manager in _pylab_helpers.Gcf.figs.values():
29292926
state['_restore_to_pylab'] = True
29302927
return state
29312928

0 commit comments

Comments
 (0)