Minor cleanups.

anntzer · anntzer · commit b475d3262dc4 · 2016-11-16T21:00:47.000-08:00
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
@@ -262,8 +262,8 @@ def limit_range_for_scale(self, vmin, vmax, minpos):
         """
         Limit the domain to positive values.
         """
-        return (vmin <= 0.0 and minpos or vmin,
-                vmax <= 0.0 and minpos or vmax)
+        return (minpos if vmin <= 0 else vmin,
+                minpos if vmax <= 0 else vmax)
 
 
 class SymmetricalLogTransform(Transform):
@@ -497,8 +497,8 @@ def limit_range_for_scale(self, vmin, vmax, minpos):
         """
         Limit the domain to values between 0 and 1 (excluded).
         """
-        return (vmin <= 0 and minpos or vmin,
-                vmax >= 1 and (1 - minpos) or vmax)
+        return (minpos if vmin <= 0 else minpos,
+                1 - minpos if vmax >= 1 else vmax)
 
 
 _scale_mapping = {
