various lint fixes

Author: nschloe

.pylintrc

@@ -1,8 +1,12 @@
 [MESSAGES CONTROL]
 
 disable=
-    invalid-name,
-    missing-docstring,
     bad-continuation,
     duplicate-code,
     fixme,
+    invalid-name,
+    missing-docstring,
+    too-many-branches,
+    too-many-statements,
+    too-many-arguments,
+    too-many-locals

matplotlib2tikz/axes.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 #
-from . import color
-
 import matplotlib as mpl
 import numpy
 
+from . import color
+
 
 class Axes(object):
     def __init__(self, data, obj):
@@ -450,7 +450,7 @@ def __get_label_rotation_and_horizontal_alignment(self, obj, data, axes):
                             % (axes, idx, x)
 
                     values.append(
-                        'align=\pgfkeysvalueof{/pgfplots/'
+                        'align=\\pgfkeysvalueof{/pgfplots/'
                         '%s_tick_label_ha_\\ticknum}' % axes)
                     values.append('text width=%s' % tick_label_text_width)
             else:

matplotlib2tikz/color.py

@@ -17,7 +17,7 @@ def mpl_color2xcolor(data, matplotlib_color):
         'red':  numpy.array([1, 0, 0]),
         'green': numpy.array([0, 1, 0]),
         'blue': numpy.array([0, 0, 1]),
-        'brown': numpy.array([0.75, 0.5,  0.25]),
+        'brown': numpy.array([0.75, 0.5, 0.25]),
         'lime': numpy.array([0.75, 1, 0]),
         'orange': numpy.array([1, 0.5, 0]),
         'pink': numpy.array([1, 0.75, 0.75]),
@@ -60,7 +60,7 @@ def mpl_color2xcolor(data, matplotlib_color):
 
         # The cases 0.0 (my_col == black) and 1.0 (my_col == rgb) are
         # already accounted for by checking in available_colors above.
-        if all(my_col[:3] == alpha * rgb) and 0.0 < alpha and alpha < 1.0:
+        if all(my_col[:3] == alpha * rgb) and 0.0 < alpha < 1.0:
             xcol = name + ('!%r!black' % (alpha * 100))
             return data, xcol, my_col
 

matplotlib2tikz/image.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 #
+import os
+
 import matplotlib as mpl
 import numpy
-import os
 import PIL
 
 
@@ -30,14 +31,14 @@ def draw_image(data, obj):
     dims = img_array.shape
     if len(dims) == 2:  # the values are given as one real number: look at cmap
         clims = obj.get_clim()
-
-        mpl.pyplot.imsave(fname=filename,
-                          arr=img_array,
-                          cmap=obj.get_cmap(),
-                          vmin=clims[0],
-                          vmax=clims[1],
-                          origin=obj.origin
-                          )
+        mpl.pyplot.imsave(
+                fname=filename,
+                arr=img_array,
+                cmap=obj.get_cmap(),
+                vmin=clims[0],
+                vmax=clims[1],
+                origin=obj.origin
+                )
     else:
         # RGB (+alpha) information at each point
         assert len(dims) == 3 and dims[2] in [3, 4]
@@ -54,19 +55,17 @@ def draw_image(data, obj):
     if isinstance(extent, list):  # convert to () list
         extent = tuple(extent)
 
+    rel_filepath = os.path.basename(filename)
     if data['rel data path']:
-        rel_filepath = os.path.join(data['rel data path'],
-                                    os.path.basename(filename)
-                                    )
-    else:
-        rel_filepath = os.path.basename(filename)
+        rel_filepath = os.path.join(data['rel data path'], rel_filepath)
 
     # Explicitly use \pgfimage as includegrapics command, as the default
     # \includegraphics fails unexpectedly in some cases
-    content.append('\\addplot graphics [includegraphics cmd=\pgfimage,'
-                   'xmin=%.15g, xmax=%.15g, '
-                   'ymin=%.15g, ymax=%.15g] {%s};\n'
-                   % (extent + (rel_filepath,))
-                   )
+    content.append(
+            '\\addplot graphics [includegraphics cmd=\\pgfimage,'
+            'xmin=%.15g, xmax=%.15g, '
+            'ymin=%.15g, ymax=%.15g] {%s};\n'
+            % (extent + (rel_filepath,))
+            )
 
     return data, content

matplotlib2tikz/line2d.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 #
+import six
+
 from . import color as mycol
 from . import path as mypath
 
-import six
-
 
 def draw_line2d(data, obj):
     '''Returns the PGFPlots code for an Line2D environment.
@@ -142,9 +142,7 @@ def draw_linecollection(data, obj):
     linewidths = obj.get_linewidths()
     paths = obj.get_paths()
 
-    for i in range(len(paths)):
-        path = paths[i]
-
+    for i, path in enumerate(paths):
         if i < len(edgecolors):
             color = edgecolors[i]
         else:

matplotlib2tikz/patch.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-from . import path as mypath
-
 import matplotlib as mpl
 
+from . import path as mypath
+
 
 def draw_patch(data, obj):
     '''Return the PGFPlots code for patches.
@@ -81,7 +81,7 @@ def _draw_rectangle(data, obj, draw_options):
 
     left_lower_x = obj.get_x()
     left_lower_y = obj.get_y()
-    cont = ('%s\draw[%s] (axis cs:%.15g,%.15g) '
+    cont = ('%s\\draw[%s] (axis cs:%.15g,%.15g) '
             'rectangle (axis cs:%.15g,%.15g);\n'
             ) % (legend,
                  ','.join(draw_options),
@@ -100,7 +100,7 @@ def _draw_ellipse(data, obj, draw_options):
         # circle specialization
         return _draw_circle(data, obj, draw_options)
     x, y = obj.center
-    cont = '\draw[%s] (axis cs:%.15g,%.15g) ellipse (%.15g and %.15g);\n' % \
+    cont = '\\draw[%s] (axis cs:%.15g,%.15g) ellipse (%.15g and %.15g);\n' % \
         (','.join(draw_options),
          x, y,
          0.5 * obj.width, 0.5 * obj.height
@@ -112,7 +112,7 @@ def _draw_circle(data, obj, draw_options):
     '''Return the PGFPlots code for circles.
     '''
     x, y = obj.center
-    cont = '\draw[%s] (axis cs:%.15g,%.15g) circle (%.15g);\n' % \
+    cont = '\\draw[%s] (axis cs:%.15g,%.15g) circle (%.15g);\n' % \
         (','.join(draw_options),
          x, y,
          obj.get_radius()

matplotlib2tikz/path.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 #
-from . import color
-from .axes import _mpl_cmap2pgf_cmap
-
 import matplotlib as mpl
 import numpy
 
+from . import color
+from .axes import _mpl_cmap2pgf_cmap
+
 
 def draw_path(obj, data, path, draw_options=None, simplify=None):
     '''Adds code for drawing an ordinary path in PGFPlots (TikZ).
@@ -141,9 +141,9 @@ def draw_pathcollection(data, obj):
         labels.append('sizedata' + 14*' ')
         draw_options.extend([
             'visualization depends on='
-            '{\\thisrow{sizedata} \\as\perpointmarksize}',
+            '{\\thisrow{sizedata} \\as\\perpointmarksize}',
             'scatter/@pre marker code/.append style='
-            '{/tikz/mark size=\perpointmarksize}',
+            '{/tikz/mark size=\\perpointmarksize}',
             ])
 
     if draw_options:

matplotlib2tikz/quadmesh.py

@@ -15,10 +15,10 @@ def draw_quadmesh(data, obj):
     if 'img number' not in data.keys():
         data['img number'] = 0
 
-    filename = os.path.join(data['output dir'],
-                            '%s_img%03d.png' % (data['base name'],
-                                                data['img number'])
-                            )
+    filename = os.path.join(
+            data['output dir'],
+            '%s_img%03d.png' % (data['base name'], data['img number'])
+            )
     data['img number'] = data['img number'] + 1
 
     # Get the dpi for rendering and store the original dpi of the figure
@@ -35,17 +35,23 @@ def draw_quadmesh(data, obj):
     obj.draw(ren)
 
     # Generate a image from the render buffer
-    image = Image.frombuffer('RGBA', ren.get_canvas_width_height(),
-                             ren.buffer_rgba(), 'raw', 'RGBA', 0, 1)
+    image = Image.frombuffer(
+            'RGBA',
+            ren.get_canvas_width_height(),
+            ren.buffer_rgba(),
+            'raw', 'RGBA', 0, 1
+            )
     # Crop the image to the actual content (removing the the regions otherwise
     # used for axes, etc.)
     # 'image.crop' expects the crop box to specify the left, upper, right, and
     # lower pixel. 'cbox.extents' gives the left, lower, right, and upper
     # pixel.
-    box = (int(round(cbox.extents[0])),
-           0,
-           int(round(cbox.extents[2])),
-           int(round(cbox.extents[3] - cbox.extents[1])))
+    box = (
+        int(round(cbox.extents[0])),
+        0,
+        int(round(cbox.extents[2])),
+        int(round(cbox.extents[3] - cbox.extents[1]))
+        )
     cropped = image.crop(box)
     cropped.save(filename)
 
@@ -55,19 +61,17 @@ def draw_quadmesh(data, obj):
     # write the corresponding information to the TikZ file
     extent = obj.axes.get_xlim() + obj.axes.get_ylim()
 
+    rel_filepath = os.path.basename(filename)
     if data['rel data path']:
-        rel_filepath = os.path.join(data['rel data path'],
-                                    os.path.basename(filename)
-                                    )
-    else:
-        rel_filepath = os.path.basename(filename)
+        rel_filepath = os.path.join(data['rel data path'], rel_filepath)
 
     # Explicitly use \pgfimage as includegrapics command, as the default
     # \includegraphics fails unexpectedly in some cases
-    content.append('\\addplot graphics [includegraphics cmd=\pgfimage,'
-                   'xmin=%.15g, xmax=%.15g, '
-                   'ymin=%.15g, ymax=%.15g] {%s};\n'
-                   % (extent + (rel_filepath,))
-                   )
+    content.append(
+            '\\addplot graphics [includegraphics cmd=\\pgfimage,'
+            'xmin=%.15g, xmax=%.15g, '
+            'ymin=%.15g, ymax=%.15g] {%s};\n'
+            % (extent + (rel_filepath,))
+            )
 
     return data, content

matplotlib2tikz/save.py

@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
 #
+import codecs
+import os
+import matplotlib as mpl
+
 from . import axes
 from . import legend
 from . import line2d
@@ -11,10 +15,6 @@
 
 from .__about__ import __version__
 
-import codecs
-import os
-import matplotlib as mpl
-
 
 def get_tikz_code(
         filepath,

matplotlib2tikz/text.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-from . import color
-
 import matplotlib as mpl
 
+from . import color
+
 
 def draw_text(data, obj):
     '''Paints text on the graph.