more lint

Author: nschloe

.pylintrc

@@ -5,6 +5,7 @@ disable=
     duplicate-code,
     fixme,
     invalid-name,
+    locally-disabled,
     missing-docstring,
     too-many-branches,
     too-many-statements,

matplotlib2tikz/axes.py

@@ -174,6 +174,7 @@ def __init__(self, data, obj):
         # Unfortunately, _tickdir doesn't seem to be quite accurate. See
         # <https://github.com/matplotlib/matplotlib/issues/5311>.
         # For now, just take the first tick direction of each of the axes.
+        # pylint: disable=protected-access
         x_tick_dirs = [tick._tickdir for tick in obj.xaxis.get_major_ticks()]
         y_tick_dirs = [tick._tickdir for tick in obj.yaxis.get_major_ticks()]
         if x_tick_dirs or y_tick_dirs:
@@ -225,6 +226,7 @@ def __init__(self, data, obj):
         # <http://sourceforge.net/p/matplotlib/mailman/message/25169234/>
         # Coordinate of the lines are entirely meaningless, but styles
         # (colors,...) are respected.
+        # pylint: disable=protected-access
         if obj.xaxis._gridOnMajor:
             self.axis_options.append('xmajorgrids')
         elif obj.xaxis._gridOnMinor:
@@ -237,6 +239,7 @@ def __init__(self, data, obj):
             if col != 'black':
                 self.axis_options.append('x grid style={%s}' % col)
 
+        # pylint: disable=protected-access
         if obj.yaxis._gridOnMajor:
             self.axis_options.append('ymajorgrids')
         elif obj.yaxis._gridOnMinor:
@@ -613,6 +616,7 @@ def _handle_linear_segmented_color_map(cmap):
     # Label the 3 elements in each row in the cdict entry for a given color as
     # (x, y0, y1).  Then for values of x between x[i] and x[i+1] the color
     # value is interpolated between y1[i] and y0[i+1].
+    # pylint: disable=protected-access
     segdata = cmap._segmentdata
     red = segdata['red']
     green = segdata['green']

matplotlib2tikz/legend.py

@@ -11,17 +11,18 @@ def draw_legend(data, obj):
     '''Adds legend code.
     '''
     texts = []
-    childrenAlignment = []
+    children_alignment = []
     for text in obj.texts:
         texts.append('%s' % text.get_text())
-        childrenAlignment.append('%s' % text.get_horizontalalignment())
+        children_alignment.append('%s' % text.get_horizontalalignment())
 
     cont = 'legend entries={{%s}}' % '},{'.join(texts)
     data['extra axis options'].add(cont)
 
     # Get the location.
     # http://matplotlib.org/api/legend_api.html
     pad = 0.03
+    # pylint: disable=protected-access
     loc = obj._loc
     if loc == 0:
         # best
@@ -33,8 +34,9 @@ def draw_legend(data, obj):
 
         # Rectangles of the legend and of the axes
         # Lower left and upper right points
-        x0_legend, x1_legend = obj._legend_box \
-            .get_window_extent(renderer).get_points()
+        # pylint: disable=protected-access
+        x0_legend, x1_legend = \
+            obj._legend_box.get_window_extent(renderer).get_points()
         x0_axes, x1_axes = obj.axes.get_window_extent(renderer).get_points()
         dimension_legend = x1_legend - x0_legend
         dimension_axes = x1_axes - x0_axes
@@ -168,26 +170,27 @@ def draw_legend(data, obj):
         legend_style.append('fill=%s' % fill_xcolor)
 
     # Get the horizontal alignment
-    if len(childrenAlignment) > 0:
-        alignment = childrenAlignment[0]
-    else:
+    try:
+        alignment = children_alignment[0]
+    except IndexError:
         alignment = None
 
-    for childAlignment in childrenAlignment:
-        if alignment != childAlignment:
+    for child_alignment in children_alignment:
+        if alignment != child_alignment:
             warnings.warn(
                 'Varying horizontal alignments in the legend. Using default.'
             )
             alignment = None
             break
 
+    if alignment:
+        data['extra axis options'].add(
+            'legend cell align={%s}' % alignment
+            )
+
     # Write styles to data
     if legend_style:
         style = 'legend style={%s}' % ', '.join(legend_style)
         data['extra axis options'].add(style)
 
-    if childAlignment:
-        cellAlign = 'legend cell align={%s}' % alignment
-        data['extra axis options'].add(cellAlign)
-
     return data

matplotlib2tikz/line2d.py

@@ -212,23 +212,23 @@ def _mpl_linewidth2pgfp_linewidth(data, line_width):
         # ('thin').
         # Match the two defaults, and scale for the rest.
         scaled_line_width = line_width / 1.0  # scale by default line width
-        if scaled_line_width == 0.25:
-            return 'ultra thin'
-        elif scaled_line_width == 0.5:
-            return 'very thin'
-        elif scaled_line_width == 1.0:
-            pass  # PGFPlots default line width, 'thin'
-        elif scaled_line_width == 1.5:
-            return 'semithick'
-        elif scaled_line_width == 2:
-            return 'thick'
-        elif scaled_line_width == 3:
-            return 'very thick'
-        elif scaled_line_width == 4:
-            return 'ultra thick'
-        else:
+        literals = {
+            0.25: 'ultra thin',
+            0.5: 'very thin',
+            1.0: None,  # default, 'thin'
+            1.5: 'semithick',
+            2: 'thick',
+            3: 'very thick',
+            4: 'ultra thick',
+            }
+
+        try:
+            out = literals[scaled_line_width]
+        except KeyError:
             # explicit line width
-            return 'line width=%rpt' % (0.4 * line_width)
+            out = 'line width=%rpt' % (0.4 * line_width)
+
+        return out
 
 
 # for matplotlib markers, see: http://matplotlib.org/api/markers_api.html