More style fixes. (#12068)

anntzer · timhoffm · commit 6646ac218067 · 2018-09-09T16:30:55.000+02:00
More style fixes.
diff --git a/.flake8 b/.flake8
@@ -57,8 +57,7 @@ per-file-ignores =
     mpl_toolkits/axes_grid1/colorbar.py: E225, E501
     mpl_toolkits/axes_grid1/inset_locator.py: E501
     mpl_toolkits/axes_grid1/mpl_axes.py: E501
-    mpl_toolkits/axisartist/angle_helper.py: E201, E203, E221, E222, E225, E251, E501
-    mpl_toolkits/axisartist/axis_artist.py: E221, E225, E228, E251, E501
+    mpl_toolkits/axisartist/angle_helper.py: E221
     mpl_toolkits/axisartist/axislines.py: E225, E501
     mpl_toolkits/axisartist/clip_path.py: E225, E501
     mpl_toolkits/axisartist/floating_axes.py: E225, E402, E501
diff --git a/lib/mpl_toolkits/axisartist/angle_helper.py b/lib/mpl_toolkits/axisartist/angle_helper.py
@@ -7,7 +7,7 @@
 def select_step_degree(dv):
 
     degree_limits_ = [1.5, 3, 7, 13, 20, 40, 70, 120, 270, 520]
-    degree_steps_  = [  1, 2, 5, 10, 15, 30, 45,  90, 180, 360]
+    degree_steps_  = [1,   2, 5, 10, 15, 30, 45,  90, 180, 360]
     degree_factors = [1.] * len(degree_steps_)
 
     minsec_limits_ = [1.5, 2.5, 3.5, 8, 11, 18, 25, 45]
@@ -41,7 +41,7 @@ def select_step_degree(dv):
 def select_step_hour(dv):
 
     hour_limits_ = [1.5, 2.5, 3.5, 5, 7, 10, 15, 21, 36]
-    hour_steps_  = [1,   2  , 3,   4, 6,  8, 12, 18, 24]
+    hour_steps_  = [1,   2,   3,   4, 6,  8, 12, 18, 24]
     hour_factors = [1.] * len(hour_steps_)
 
     minsec_limits_ = [1.5, 2.5, 3.5, 4.5, 5.5, 8, 11, 14, 18, 25, 45]
@@ -141,11 +141,11 @@ def select_step(v1, v2, nv, hour=False, include_last=True,
 
 
 def select_step24(v1, v2, nv, include_last=True, threshold_factor=3600):
-    v1, v2 = v1/15., v2/15.
-    levs, n, factor =  select_step(v1, v2, nv, hour=True,
-                                   include_last=include_last,
-                                   threshold_factor=threshold_factor)
-    return levs*15., n, factor
+    v1, v2 = v1 / 15, v2 / 15
+    levs, n, factor = select_step(v1, v2, nv, hour=True,
+                                  include_last=include_last,
+                                  threshold_factor=threshold_factor)
+    return levs * 15, n, factor
 
 
 def select_step360(v1, v2, nv, include_last=True, threshold_factor=3600):
@@ -243,36 +243,34 @@ def _get_number_fraction(self, factor):
     def __call__(self, direction, factor, values):
         if len(values) == 0:
             return []
-        #ss = [[-1, 1][v>0] for v in values] #not py24 compliant
-        values = np.asarray(values)
-        ss = np.where(values>0, 1, -1)
 
-        sign_map = {(-1, True): "-"}
-        signs = [sign_map.get((s, v!=0), "") for s, v in zip(ss, values)]
+        ss = np.sign(values)
+        signs = ["-" if v < 0 else "" for v in values]
 
         factor, number_fraction = self._get_number_fraction(factor)
 
         values = np.abs(values)
 
         if number_fraction is not None:
-            values, frac_part = divmod(values, 10**number_fraction)
+            values, frac_part = divmod(values, 10 ** number_fraction)
             frac_fmt = "%%0%dd" % (number_fraction,)
             frac_str = [frac_fmt % (f1,) for f1 in frac_part]
 
         if factor == 1:
             if number_fraction is None:
-                return [self.fmt_d % (s*int(v),) for (s, v) in zip(ss, values)]
+                return [self.fmt_d % (s * int(v),) for s, v in zip(ss, values)]
             else:
-                return [self.fmt_ds % (s*int(v), f1)
-                        for (s, v, f1) in zip(ss, values, frac_str)]
+                return [self.fmt_ds % (s * int(v), f1)
+                        for s, v, f1 in zip(ss, values, frac_str)]
         elif factor == 60:
             deg_part, min_part = divmod(values, 60)
             if number_fraction is None:
                 return [self.fmt_d_m % (s1, d1, m1)
                         for s1, d1, m1 in zip(signs, deg_part, min_part)]
             else:
                 return [self.fmt_d_ms % (s, d1, m1, f1)
-                        for s, d1, m1, f1 in zip(signs, deg_part, min_part, frac_str)]
+                        for s, d1, m1, f1
+                        in zip(signs, deg_part, min_part, frac_str)]
 
         elif factor == 3600:
             if ss[-1] == -1:
@@ -291,7 +289,8 @@ def __call__(self, direction, factor, values):
             if number_fraction is None:
                 sec_str = [self.fmt_s_partial % (s1,) for s1 in sec_part]
             else:
-                sec_str = [self.fmt_ss_partial % (s1, f1) for s1, f1 in zip(sec_part, frac_str)]
+                sec_str = [self.fmt_ss_partial % (s1, f1)
+                           for s1, f1 in zip(sec_part, frac_str)]
 
             for s, d1, m1, s1 in zip(signs, deg_part, min_part, sec_str):
                 l_hm = self.fmt_d_m_partial % (s, d1, m1)
@@ -328,20 +327,16 @@ class FormatterHMS(FormatterDMS):
     fmt_ss_partial = "%02d.%s" + sec_mark + "$"
 
     def __call__(self, direction, factor, values):  # hour
-        return FormatterDMS.__call__(self, direction, factor, np.asarray(values)/15.)
+        return super().__call__(direction, factor, np.asarray(values) / 15)
 
 
 class ExtremeFinderCycle(ExtremeFinderSimple):
     """
     When there is a cycle, e.g., longitude goes from 0-360.
     """
-    def __init__(self,
-                 nx, ny,
-                 lon_cycle = 360.,
-                 lat_cycle = None,
-                 lon_minmax = None,
-                 lat_minmax = (-90, 90)
-                 ):
+    def __init__(self, nx, ny,
+                 lon_cycle=360., lat_cycle=None,
+                 lon_minmax=None, lat_minmax=(-90, 90)):
         self.nx, self.ny = nx, ny
         self.lon_cycle, self.lat_cycle = lon_cycle, lat_cycle
         self.lon_minmax = lon_minmax
diff --git a/lib/mpl_toolkits/axisartist/axis_artist.py b/lib/mpl_toolkits/axisartist/axis_artist.py
