more lints

Author: nschloe

.travis.yml

@@ -35,7 +35,6 @@ before_install:
   # Make sure to put the readme test at the very end; otherwise it's messing
   # around with the other tests.
   - code_extract README.md test/zzz_readme_test.py --filter python,test
-  - pylint matplotlib2tikz
 
 install:
   - pip install -r test_requirements.txt
@@ -52,6 +51,7 @@ before_script:
 
 # run tests
 script:
+  - pylint matplotlib2tikz
   # cd into test directory to make sure we're using the pip-installed
   # matplotlib2tikz.
   - cd test && MPLBACKEND=Agg pytest --cov matplotlib2tikz

matplotlib2tikz/__init__.py

@@ -2,6 +2,7 @@
 #
 '''Script to convert Matplotlib generated figures into TikZ/PGFPlots figures.
 '''
+from __future__ import print_function
 
 from matplotlib2tikz.__about__ import (
         __author__,

matplotlib2tikz/axes.py

@@ -399,8 +399,8 @@ def get_end_code(self, data):
         elif self.is_subplot and self.nsubplots == self.subplot_index:
             data['is_in_groupplot_env'] = False
             return '\\end{groupplot}\n\n'
-        else:
-            return ''
+
+        return ''
 
 
 def _get_label_rotation_and_horizontal_alignment(
@@ -421,7 +421,7 @@ def _get_label_rotation_and_horizontal_alignment(
         obj.xaxis.get_majorticklabels() if axes_obj == 'x' \
         else obj.yaxis.get_majorticklabels()
 
-    if len(major_tick_labels) == 0:
+    if not major_tick_labels:
         return None
 
     tick_labels_rotation = \
@@ -448,7 +448,7 @@ def _get_label_rotation_and_horizontal_alignment(
                   'label text width\' has been passed in the \'extra\' '
                   'parameter' % axes_obj)
 
-        if len(values) > 0:
+        if values:
             label_style = \
                 '%sticklabel style = {%s}' % (axes_obj, ','.join(values))
     else:
@@ -733,16 +733,16 @@ def _handle_listed_color_map(cmap):
     if cmap.N is None or cmap.N == len(cmap.colors):
         colors = [
             'rgb(%d%s)=(%.15g,%.15g,%.15g)'
-            % (k, unit, color[0], color[1], color[2])
-            for (k, color) in enumerate(cmap.colors)
+            % (k, unit, rgb[0], rgb[1], rgb[2])
+            for (k, rgb) in enumerate(cmap.colors)
             ]
     else:
         reps = int(float(cmap.N) / len(cmap.colors) - 0.5) + 1
         repeated_cols = reps * cmap.colors
         colors = [
             'rgb(%d%s)=(%.15g,%.15g,%.15g)'
-            % (k, unit, color[0], color[1], color[2])
-            for (k, color) in enumerate(repeated_cols[:cmap.N])
+            % (k, unit, rgb[0], rgb[1], rgb[2])
+            for (k, rgb) in enumerate(repeated_cols[:cmap.N])
             ]
 
     colormap_string = '{mymap}{[1%s]\n  %s\n}' % \

matplotlib2tikz/line2d.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 #
+from __future__ import print_function
+
 import six
 
 from . import color as mycol
@@ -15,6 +17,7 @@ def draw_line2d(data, obj):
     # If line is of length 0, do nothing.  Otherwise, an empty \addplot table
     # will be created, which will be interpreted as an external data source
     # in either the file '' or '.tex'.  Instead, render nothing.
+    # pylint: disable=len-as-condition
     if len(obj.get_xdata()) == 0:
         return data, []
 

matplotlib2tikz/patch.py

@@ -21,22 +21,28 @@ def draw_patch(data, obj):
     elif isinstance(obj, mpl.patches.Ellipse):
         # ellipse specialization
         return _draw_ellipse(data, obj, draw_options)
-    else:
-        # regular patch
-        return mypath.draw_path(
-            data, obj.get_path(), draw_options=draw_options
-            )
+
+    # regular patch
+    return mypath.draw_path(
+        data, obj.get_path(), draw_options=draw_options
+        )
 
 
 def draw_patchcollection(data, obj):
     '''Returns PGFPlots code for a number of patch objects.
     '''
     content = []
     # Gather the draw options.
-    edge_colors = obj.get_edgecolor()
-    edge_color = None if len(edge_colors) == 0 else edge_colors[0]
-    face_colors = obj.get_facecolor()
-    face_color = None if len(face_colors) == 0 else face_colors[0]
+    try:
+        edge_color = obj.get_edgecolor()[0]
+    except IndexError:
+        edge_color = None
+
+    try:
+        face_color = obj.get_facecolor()[0]
+    except IndexError:
+        face_color = None
+
     data, draw_options = mypath.get_draw_options(
             data, edge_color, face_color
             )

matplotlib2tikz/save.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 #
+from __future__ import print_function
+
 import codecs
 import os
 import matplotlib as mpl
@@ -290,8 +292,13 @@ def _recurse(data, obj):
         elif isinstance(child, mpl.patches.Patch):
             data, cont = patch.draw_patch(data, child)
             content.extend(cont, child.get_zorder())
-        elif isinstance(child, mpl.collections.PatchCollection) or \
-                isinstance(child, mpl.collections.PolyCollection):
+        elif isinstance(
+                child,
+                (
+                    mpl.collections.PatchCollection,
+                    mpl.collections.PolyCollection
+                )
+                ):
             data, cont = patch.draw_patchcollection(data, child)
             content.extend(cont, child.get_zorder())
         elif isinstance(child, mpl.collections.PathCollection):
@@ -305,16 +312,18 @@ def _recurse(data, obj):
             content.extend(cont, child.get_zorder())
         elif isinstance(child, mpl.legend.Legend):
             data = legend.draw_legend(data, child)
-        elif isinstance(child, mpl.axis.XAxis) or \
-                isinstance(child, mpl.axis.YAxis) or \
-                isinstance(child, mpl.spines.Spine) or \
-                isinstance(child, mpl.text.Text):
+        elif isinstance(
+                child,
+                (
+                    mpl.axis.XAxis, mpl.axis.YAxis,
+                    mpl.spines.Spine, mpl.text.Text
+                )):
             pass
         else:
             print('matplotlib2tikz: Don''t know how to handle object ''%s''.' %
                   type(child))
     # XXX: This is ugly
-    if isinstance(obj, mpl.axes.Subplot) or isinstance(obj, mpl.figure.Figure):
+    if isinstance(obj, (mpl.axes.Subplot, mpl.figure.Figure)):
         for text in obj.texts:
             data, cont = mytext.draw_text(data, text)
             content.extend(cont, text.get_zorder())

matplotlib2tikz/text.py

@@ -189,15 +189,18 @@ def _transform_positioning(ha, va):
     Not quite accurate but the results are equivalent more or less.'''
     if ha == 'center' and va == 'center':
         return None
-    else:
-        ha_mpl_to_tikz = {'right': 'east',
-                          'left': 'west',
-                          'center': ''
-                          }
-        va_mpl_to_tikz = {'top': 'north',
-                          'bottom': 'south',
-                          'center': '',
-                          'baseline': 'base'
-                          }
-        return ('anchor=%s %s' % (va_mpl_to_tikz[va], ha_mpl_to_tikz[ha])
-                ).strip()
+
+    ha_mpl_to_tikz = {
+            'right': 'east',
+            'left': 'west',
+            'center': ''
+            }
+    va_mpl_to_tikz = {
+            'top': 'north',
+            'bottom': 'south',
+            'center': '',
+            'baseline': 'base'
+            }
+    return (
+        'anchor=%s %s' % (va_mpl_to_tikz[va], ha_mpl_to_tikz[ha])
+        ).strip()