8000 Merge pull request #14625 from anntzer/silent · matplotlib/matplotlib@eedb9f6 · GitHub
[go: up one dir, main page]
Skip to content

Commit eedb9f6

Browse files
timhoffmtimhoffm
authored
Merge pull request #14625 from anntzer/silent
Don't double-wrap in silent_list.
2 parents 804d32e + 5ce8665 commit eedb9f6

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

@@ -3361,8 +3357,7 @@ def get_xmajorticklabels(self):
33613357
labels : list
33623358
List of `~matplotlib.text.Text` instances
33633359
"""
3364-
return cbook.silent_list('Text xticklabel',
3365-
self.xaxis.get_majorticklabels())
3360+
return self.xaxis.get_majorticklabels()
33663361

33673362
def get_xminorticklabels(self):
33683363
"""
@@ -3373,8 +3368,7 @@ def get_xminorticklabels(self):
33733368
labels : list
33743369
List of `~matplotlib.text.Text` instances
33753370
"""
3376-
return cbook.silent_list('Text xticklabel',
3377-
self.xaxis.get_minorticklabels())
3371+
return self.xaxis.get_minorticklabels()
33783372

33793373
def get_xticklabels(self, minor=False, which=None):
33803374
"""
@@ -3396,9 +3390,7 @@ def get_xticklabels(self, minor=False, which=None):
33963390
ret : list
33973391
List of `~matplotlib.text.Text` instances.
33983392
"""
3399-
return cbook.silent_list('Text xticklabel',
3400-
self.xaxis.get_ticklabels(minor=minor,
3401-
which=which))
3393+
return self.xaxis.get_ticklabels(minor=minor, which=which)
34023394

34033395
def set_xticklabels(self, labels, fontdict=None, minor=False, **kwargs):
34043396
"""
@@ -3744,8 +3736,7 @@ def get_ymajorticklabels(self):
37443736
labels : list
37453737
List of `~matplotlib.text.Text` instances
37463738
"""
3747-
return cbook.silent_list('Text yticklabel',
3748-
self.yaxis.get_majorticklabels())
3739+
return self.yaxis.get_majorticklabels()
37493740

37503741
def get_yminorticklabels(self):
37513742
"""
@@ -3756,8 +3747,7 @@ def get_yminorticklabels(self):
37563747
labels : list
37573748
List of `~matplotlib.text.Text` instances
37583749
"""
3759-
return cbook.silent_list('Text yticklabel',
3760-
self.yaxis.get_minorticklabels())
3750+
return self.yaxis.get_minorticklabels()
37613751

37623752
def get_yticklabels(self, minor=False, which=None):
37633753
"""
@@ -3779,9 +3769,7 @@ def get_yticklabels(self, minor=False, which=None):
37793769
ret : list
37803770
List of `~matplotlib.text.Text` instances.
37813771
"""
3782-
return cbook.silent_list('Text yticklabel',
3783-
self.yaxis.get_ticklabels(minor=minor,
3784-
which=which))
3772+
return self.yaxis.get_ticklabels(minor=minor, which=which)
37853773

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

‎lib/matplotlib/pyplot.py

Lines changed: 4 additions & 6 deletions
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< E3A3 div class="d-flex">
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