Merge pull request #14625 from anntzer/silent

timhoffm · web-flow · commit eedb9f6ea6c0 · 2019-07-04T23:31:28.000+02:00
Don't double-wrap in silent_list.
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -1765,27 +1765,23 @@ def get_xaxis(self):
 
     def get_xgridlines(self):
         """Get the x grid lines as a list of `Line2D` instances."""
-        return cbook.silent_list('Line2D xgridline',
-                                 self.xaxis.get_gridlines())
+        return self.xaxis.get_gridlines()
 
     def get_xticklines(self):
         """Get the x tick lines as a list of `Line2D` instances."""
-        return cbook.silent_list('Line2D xtickline',
-                                 self.xaxis.get_ticklines())
+        return self.xaxis.get_ticklines()
 
     def get_yaxis(self):
         """Return the YAxis instance."""
         return self.yaxis
 
     def get_ygridlines(self):
         """Get the y grid lines as a list of `Line2D` instances."""
-        return cbook.silent_list('Line2D ygridline',
-                                 self.yaxis.get_gridlines())
+        return self.yaxis.get_gridlines()
 
     def get_yticklines(self):
         """Get the y tick lines as a list of `Line2D` instances."""
-        return cbook.silent_list('Line2D ytickline',
-                                 self.yaxis.get_ticklines())
+        return self.yaxis.get_ticklines()
 
     # Adding and tracking artists
 
@@ -3361,8 +3357,7 @@ def get_xmajorticklabels(self):
         labels : list
             List of `~matplotlib.text.Text` instances
         """
-        return cbook.silent_list('Text xticklabel',
-                                 self.xaxis.get_majorticklabels())
+        return self.xaxis.get_majorticklabels()
 
     def get_xminorticklabels(self):
         """
@@ -3373,8 +3368,7 @@ def get_xminorticklabels(self):
         labels : list
             List of `~matplotlib.text.Text` instances
         """
-        return cbook.silent_list('Text xticklabel',
-                                 self.xaxis.get_minorticklabels())
+        return self.xaxis.get_minorticklabels()
 
     def get_xticklabels(self, minor=False, which=None):
         """
@@ -3396,9 +3390,7 @@ def get_xticklabels(self, minor=False, which=None):
         ret : list
            List of `~matplotlib.text.Text` instances.
         """
-        return cbook.silent_list('Text xticklabel',
-                                 self.xaxis.get_ticklabels(minor=minor,
-                                                           which=which))
+        return self.xaxis.get_ticklabels(minor=minor, which=which)
 
     def set_xticklabels(self, labels, fontdict=None, minor=False, **kwargs):
         """
@@ -3744,8 +3736,7 @@ def get_ymajorticklabels(self):
         labels : list
             List of `~matplotlib.text.Text` instances
         """
-        return cbook.silent_list('Text yticklabel',
-                                 self.yaxis.get_majorticklabels())
+        return self.yaxis.get_majorticklabels()
 
     def get_yminorticklabels(self):
         """
@@ -3756,8 +3747,7 @@ def get_yminorticklabels(self):
         labels : list
             List of `~matplotlib.text.Text` instances
         """
-        return cbook.silent_list('Text yticklabel',
-                                 self.yaxis.get_minorticklabels())
+        return self.yaxis.get_minorticklabels()
 
     def get_yticklabels(self, minor=False, which=None):
         """
@@ -3779,9 +3769,7 @@ def get_yticklabels(self, minor=False, which=None):
         ret : list
            List of `~matplotlib.text.Text` instances.
         """
-        return cbook.silent_list('Text yticklabel',
-                                 self.yaxis.get_ticklabels(minor=minor,
-                                                           which=which))
+        return self.yaxis.get_ticklabels(minor=minor, which=which)
 
     def set_yticklabels(self, labels, fontdict=None, minor=False, **kwargs):
         """
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -1504,7 +1504,7 @@ def xticks(ticks=None, labels=None, **kwargs):
     for l in labels:
         l.update(kwargs)
 
-    return locs, silent_list('Text xticklabel', labels)
+    return locs, labels
 
 
 def yticks(ticks=None, labels=None, **kwargs):
@@ -1579,7 +1579,7 @@ def yticks(ticks=None, labels=None, **kwargs):
     for l in labels:
         l.update(kwargs)
 
-    return locs, silent_list('Text yticklabel', labels)
+    return locs, labels
 
 
 def rgrids(*args, **kwargs):
@@ -1646,8 +1646,7 @@ def rgrids(*args, **kwargs):
         labels = ax.yaxis.get_ticklabels()
     else:
         lines, labels = ax.set_rgrids(*args, **kwargs)
-    return (silent_list('Line2D rgridline', lines),
-            silent_list('Text rgridlabel', labels))
+    return lines, labels
 
 
 def thetagrids(*args, **kwargs):
@@ -1711,8 +1710,7 @@ def thetagrids(*args, **kwargs):
         labels = ax.xaxis.get_ticklabels()
     else:
         lines, labels = ax.set_thetagrids(*args, **kwargs)
-    return (silent_list('Line2D thetagridline', lines),
-            silent_list('Text thetagridlabel', labels))
+    return lines, labels
 
 
 ## Plotting Info ##
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -887,8 +887,7 @@ def get_zmajorticklabels(self):
 
         .. versionadded :: 1.1.0
         """
-        return cbook.silent_list('Text zticklabel',
-                                 self.zaxis.get_majorticklabels())
+        return self.zaxis.get_majorticklabels()
 
     def get_zminorticklabels(self):
         """
@@ -900,8 +899,7 @@ def get_zminorticklabels(self):
 
         .. versionadded :: 1.1.0
         """
-        return cbook.silent_list('Text zticklabel',
-                                 self.zaxis.get_minorticklabels())
+        return self.zaxis.get_minorticklabels()
 
     def set_zticklabels(self, *args, **kwargs):
         """
@@ -925,8 +923,7 @@ def get_zticklabels(self, minor=False):
 
         .. versionadded:: 1.1.0
         """
-        return cbook.silent_list('Text zticklabel',
-                                 self.zaxis.get_ticklabels(minor=minor))
+        return self.zaxis.get_ticklabels(minor=minor)
 
     def zaxis_date(self, tz=None):
         """
