Merge pull request #8728 from jhelie/fix-some-lgtm-alerts

tacaswell · web-flow · commit e6ef481a32ed · 2017-06-07T11:29:34.000-07:00
MNT: fix some lgtm alerts
diff --git a/examples/pylab_examples/arrow_demo.py b/examples/pylab_examples/arrow_demo.py
@@ -119,8 +119,6 @@ def do_fontsize(k):
 
     arrow_h_offset = 0.25  # data coordinates, empirically determined
     max_arrow_length = 1 - 2*arrow_h_offset
-
-    max_arrow_width = max_arrow_width
     max_head_width = 2.5*max_arrow_width
     max_head_length = 2*max_arrow_width
     arrow_params = {'length_includes_head': True, 'shape': shape,
@@ -165,10 +163,9 @@ def draw_arrow(pair, alpha=alpha, ec=ec, labelcolor=labelcolor):
         else:
             length = max_arrow_length
         # set the transparency of the arrow
-        if display == 'alph':
+        if display == 'alpha':
             alpha = min(data[pair]/sf, alpha)
-        else:
-            alpha = alpha
+
         # set the width of the arrow
         if display == 'width':
             scale = data[pair]/sf
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -137,8 +137,7 @@ def _get_papertype(w, h):
         if key.startswith('l'): continue
         pw, ph = papersize[key]
         if (w < pw) and (h < ph): return key
-    else:
-        return 'a0'
+    return 'a0'
 
 def _num_to_str(val):
     if isinstance(val, six.string_types): return val
diff --git a/lib/matplotlib/backends/qt_compat.py b/lib/matplotlib/backends/qt_compat.py
@@ -190,7 +190,6 @@ def _getSaveFileName(*args, **kwargs):
         _getSaveFileName = QtWidgets.QFileDialog.getSaveFileName
     except ImportError:
         # tried PySide2, failed, fall back to PySide
-        QT_API = rcParams['backend.qt4']
         QT_RC_MAJOR_VERSION = 4
         QT_API = QT_API_PYSIDE
 
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -717,7 +717,6 @@ def set_size_inches(self, w, h=None, forward=True):
         if not all(np.isfinite(_) for _ in (w, h)):
             raise ValueError('figure size must be finite not '
                              '({}, {})'.format(w, h))
-        dpival = self.dpi
         self.bbox_inches.p1 = w, h
 
         if forward:
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -3881,7 +3881,6 @@ def cross_from_below(x, threshold):
 
     """
     x = np.asarray(x)
-    threshold = threshold
     ind = np.nonzero((x[:-1] < threshold) & (x[1:] >= threshold))[0]
     if len(ind):
         return ind+1
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -1216,9 +1216,6 @@ def _validate_linestyle(ls):
     'legend.borderaxespad': [0.5, validate_float],
     # the border between the axes and legend edge
     'legend.columnspacing': [2., validate_float],
-    # the relative size of legend markers vs. original
-    'legend.markerscale': [1.0, validate_float],
-    'legend.shadow': [False, validate_bool],
     'legend.facecolor': ['inherit', validate_color_or_inherit],
     'legend.edgecolor': ['0.8', validate_color_or_inherit],
 
diff --git a/lib/matplotlib/stackplot.py b/lib/matplotlib/stackplot.py
@@ -86,7 +86,6 @@ def stackplot(axes, x, *args, **kwargs):
 
     elif baseline == 'weighted_wiggle':
         m, n = y.shape
-        center = np.zeros(n)
         total = np.sum(y, 0)
         # multiply by 1/total (or zero) to avoid infinities in the division:
         inv_total = np.zeros_like(total)
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -1305,12 +1305,9 @@ def transform(self, values):
             return res.reshape(-1)
         elif ndim == 2:
             return res
-        else:
-            raise ValueError(
-                "Input values must have shape (N x {dims}) "
-                "or ({dims}).".format(dims=self.input_dims))
-
-        return res
+        raise ValueError(
+            "Input values must have shape (N x {dims}) "
+            "or ({dims}).".format(dims=self.input_dims))
 
     def transform_affine(self, values):
         """
diff --git a/lib/mpl_toolkits/axisartist/clip_path.py b/lib/mpl_toolkits/axisartist/clip_path.py
@@ -10,7 +10,7 @@
 import warnings
 
 def atan2(dy, dx):
-    if dx == 0 and dx == 0:
+    if dx == 0 and dy == 0:
         warnings.warn("dx and dy is 0")
         return 0
     else:
diff --git a/tools/gh_api.py b/tools/gh_api.py
@@ -183,8 +183,7 @@ def get_milestone_id(project, milestone, auth=False, **params):
     for mstone in milestones:
         if mstone['title'] == milestone:
             return mstone['number']
-    else:
-        raise ValueError("milestone %s not found" % milestone)
+    raise ValueError("milestone %s not found" % milestone)
 
 def is_pull_request(issue):
     """Return True if the given issue is a pull request."""
