Merge pull request #14351 from anntzer/redundant-check-in-list

dstansby · web-flow · commit ed69d985c062 · 2019-06-18T17:39:01.000+01:00
Remove some redundant check_in_list calls.
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
@@ -617,6 +617,7 @@ class LogitTransform(Transform):
 
     def __init__(self, nonpos='mask'):
         Transform.__init__(self)
+        cbook._check_in_list(['mask', 'clip'], nonpos=nonpos)
         self._nonpos = nonpos
         self._clip = {"clip": True, "mask": False}[nonpos]
 
@@ -633,8 +634,7 @@ def inverted(self):
         return LogisticTransform(self._nonpos)
 
     def __str__(self):
-        return "{}({!r})".format(type(self).__name__,
-            "clip" if self._clip else "mask")
+        return "{}({!r})".format(type(self).__name__, self._nonpos)
 
 
 class LogisticTransform(Transform):
@@ -673,7 +673,6 @@ def __init__(self, axis, nonpos='mask'):
           values beyond ]0, 1[ can be masked as invalid, or clipped to a number
           very close to 0 or 1
         """
-        cbook._check_in_list(['mask', 'clip'], nonpos=nonpos)
         self._transform = LogitTransform(nonpos)
 
     def get_transform(self):
diff --git a/lib/mpl_toolkits/axisartist/axis_artist.py b/lib/mpl_toolkits/axisartist/axis_artist.py
@@ -471,7 +471,6 @@ def set_axis_direction(self, d):
         Adjust the text angle and text alignment of axis label
         according to the matplotlib convention.
 
-
         =====================    ========== ========= ========== ==========
         property                 left       bottom    right      top
         =====================    ========== ========= ========== ==========
@@ -483,9 +482,7 @@ def set_axis_direction(self, d):
         Note that the text angles are actually relative to (90 + angle
         of the direction to the ticklabel), which gives 0 for bottom
         axis.
-
         """
-        cbook._check_in_list(["left", "right", "top", "bottom"], d=d)
         self.set_default_alignment(d)
         self.set_default_angle(d)
 
@@ -555,11 +552,9 @@ def set_axis_direction(self, label_direction):
         of the direction to the ticklabel), which gives 0 for bottom
         axis.
         """
-        cbook._check_in_list(["left", "right", "top", "bottom"],
-                             label_direction=label_direction)
-        self._axis_direction = label_direction
         self.set_default_alignment(label_direction)
         self.set_default_angle(label_direction)
+        self._axis_direction = label_direction
 
     def invert_axis_direction(self):
         label_direction = self._get_opposite_direction(self._axis_direction)
@@ -836,17 +831,15 @@ def set_axis_direction(self, axis_direction):
         relative to (90 + angle of the direction to the ticklabel),
         which gives 0 for bottom axis.
         """
-        cbook._check_in_list(["left", "right", "top", "bottom"],
-                             axis_direction=axis_direction)
+        self.major_ticklabels.set_axis_direction(axis_direction)
+        self.label.set_axis_direction(axis_direction)
         self._axis_direction = axis_direction
         if axis_direction in ["left", "top"]:
             self.set_ticklabel_direction("-")
             self.set_axislabel_direction("-")
         else:
             self.set_ticklabel_direction("+")
             self.set_axislabel_direction("+")
-        self.major_ticklabels.set_axis_direction(axis_direction)
-        self.label.set_axis_direction(axis_direction)
 
     def set_ticklabel_direction(self, tick_direction):
         r"""
