8000 Don't double-wrap in silent_list. · matplotlib/matplotlib@f34005b · GitHub
[go: up one dir, main page]
Skip to content

Commit f34005b

Browse files
anntzeranntzer
committed
Don't double-wrap in silent_list.
Axis.get_ticklines, Axis.get_ticklabels, and Axis.get_gridlines already wrap their return value in a silent_list; we don't need to rewrap it a second time in the Axes methods.
1 parent e8b40f9 commit f34005b

File tree

3 files changed

+17
-34
lines changed

3 files changed

+17
-34
lines changed

‎lib/matplotlib/axes/_base.py

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1765,27 +1765,23 @@ def get_xaxis(self):
17651765

17661766
def get_xgridlines(self):
17671767
"""Get the x grid lines as a list of `Line2D` instances."""
1768-
return cbook.silent_list('Line2D xgridline',
1769-
self.xaxis.get_gridlines())
1768+
return self.xaxis.get_gridlines()
17701769

17711770
def get_xticklines(self):
17721771
"""Get the x tick lines as a list of `Line2D` instances."""
1773-
return cbook.silent_list('Line2D xtickline',
1774-
self.xaxis.get_ticklines())
1772+
return self.xaxis.get_ticklines()
17751773

17761774
def get_yaxis(self):
17771775
"""Return the YAxis instance."""
17781776
return self.yaxis
17791777

17801778
def get_ygridlines(self):
17811779
"""Get the y grid lines as a list of `Line2D` instances."""
1782-
return cbook.silent_list('Line2D ygridline',
1783-
self.yaxis.get_gridlines())
1780+
return self.yaxis.get_gridlines()
17841781

17851782
def get_yticklines(self):
17861783
"""Get the y tick lines as a list of `Line2D` instances."""
1787-
return cbook.silent_list('Line2D ytickline',
1788-
self.yaxis.get_ticklines())
1784+
return self.yaxis.get_ticklines()
17891785

17901786
# Adding and tracking artists
17911787

@@ -3358,8 +3354,7 @@ def get_xmajorticklabels(self):
33583354
labels : list
33593355
List of `~matplotlib.text.Text` instances
33603356
"""
3361-
return cbook.silent_list('Text xticklabel',
3362-
self.xaxis.get_majorticklabels())
3357+
return self.xaxis.get_majorticklabels()
33633358

33643359
def get_xminorticklabels(self):
33653360
"""
@@ -3370,8 +3365,7 @@ def get_xminorticklabels(self):
33703365
labels : list
33713366
List of `~matplotlib.text.Text` instances
33723367
"""
3373-
return cbook.silent_list('Text xticklabel',
3374-
self.xaxis.get_minorticklabels())
3368+
return self.xaxis.get_minorticklabels()
33753369

33763370
def get_xticklabels(self, minor=False, which=None):
33773371
"""
@@ -3393,9 +3387,7 @@ def get_xticklabels(self, minor=False, which=None):
33933387
ret : list
33943388
List of `~matplotlib.text.Text` instances.
33953389
"""
3396-
return cbook.silent_list('Text xticklabel',
3397-
self.xaxis.get_ticklabels(minor=minor,
3398-
which=which))
3390+
return self.xaxis.get_ticklabels(minor=minor, which=which)
33993391

34003392
def set_xticklabels(self, labels, fontdict=None, minor=False, **kwargs):
34013393
"""
@@ -3738,8 +3730,7 @@ def get_ymajorticklabels(self):
37383730
labels : list
37393731
List of `~matplotlib.text.Text` instances
37403732
"""
3741-
return cbook.silent_list('Text yticklabel',
3742-
self.yaxis.get_majorticklabels())
3733+
return self.yaxis.get_majorticklabels()
37433734

37443735
def get_yminorticklabels(self):
37453736
"""
@@ -3750,8 +3741,7 @@ def get_yminorticklabels(self):
37503741
labels : list
37513742
List of `~matplotlib.text.Text` instances
37523743
"""
3753-
return cbook.silent_list('Text yticklabel',
3754-
self.yaxis.get_minorticklabels())
3744+
return self.yaxis.get_minorticklabels()
37553745

37563746
def get_yticklabels(self, minor=False, which=None):
37573747
"""
@@ -3773,9 +3763,7 @@ def get_yticklabels(self, minor=False, which=None):
37733763
ret : list
37743764
List of `~matplotlib.text.Text` instances.
37753765
"""
3776-
return cbook.silent_list('Text yticklabel',
3777-
self.yaxis.get_ticklabels(minor=minor,
3778-
which=which))
3766+
return self.yaxis.get_ticklabels(minor=minor, which=which)
37793767

37803768
def set_yticklabels(self, labels, fontdict=None, minor=False, **kwargs):
37813769
"""

‎lib/matplotlib/pyplot.py

Lines changed: 4 additions & 6 deletions
F438
Original file line numberDiff line numberDiff line change
@@ -1504,7 +1504,7 @@ def xticks(ticks=None, labels=None, **kwargs):
15041504
for l in labels:
15051505
l.update(kwargs)
15061506

1507-
return locs, silent_list('Text xticklabel', labels)
1507+
return locs, labels
15081508

15091509

15101510
def yticks(ticks=None, labels=None, **kwargs):
@@ -1579,7 +1579,7 @@ def yticks(ticks=None, labels=None, **kwargs):
15791579
for l in labels:
15801580
l.update(kwargs)
15811581

1582-
return locs, silent_list('Text yticklabel', labels)
1582+
return locs, labels
15831583

15841584

15851585
def rgrids(*args, **kwargs):
@@ -1646,8 +1646,7 @@ def rgrids(*args, **kwargs):
16461646
labels = ax.yaxis.get_ticklabels()
16471647
else:
16481648
lines, labels = ax.set_rgrids(*args, **kwargs)
1649-
return (silent_list('Line2D rgridline', lines),
1650-
silent_list('Text rgridlabel', labels))
1649+
return (lines, labels)
16511650

16521651

16531652
def thetagrids(*args, **kwargs):
@@ -1711,8 +1710,7 @@ def thetagrids(*args, **kwargs):
17111710
labels = ax.xaxis.get_ticklabels()
17121711
else:
17131712
lines, labels = ax.set_thetagrids(*args, **kwargs)
1714-
return (silent_list('Line2D thetagridline', lines),
1715-
silent_list('Text thetagridlabel', labels))
1713+
return (lines, labels)
17161714

17171715

17181716
## Plotting Info ##

‎lib/mpl_toolkits/mplot3d/axes3d.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -887,8 +887,7 @@ def get_zmajorticklabels(self):
887887
888888
.. versionadded :: 1.1.0
889889
"""
890-
return cbook.silent_list('Text zticklabel',
891-
self.zaxis.get_majorticklabels())
890+
return self.zaxis.get_majorticklabels()
892891

893892
def get_zminorticklabels(self):
894893
"""
@@ -900,8 +899,7 @@ def get_zminorticklabels(self):
900899
901900
.. versionadded :: 1.1.0
902901
"""
903-
return cbook.silent_list('Text zticklabel',
904-
self.zaxis.get_minorticklabels())
902+
return self.zaxis.get_minorticklabels()
905903

906904
def set_zticklabels(self, *args, **kwargs):
907905
"""
@@ -925,8 +923,7 @@ def get_zticklabels(self, minor=False):
925923
926924
.. versionadded:: 1.1.0
927925
"""
928-
return cbook.silent_list('Text zticklabel',
929-
self.zaxis.get_ticklabels(minor=minor))
926+
return self.zaxis.get_ticklabels(minor=minor)
930927

931928
def zaxis_date(self, tz=None):
932929
"""

0 commit comments

Comments
 (0)
0