Merge 6d6d0a7 into fcfb937

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2010-2015 Nico Schlömer
+Copyright (c) 2010-2016 Nico Schlömer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

matplotlib2tikz/__init__.py

@@ -5,10 +5,10 @@
 
 __author__ = 'Nico Schlömer'
 __email__ = 'nico.schloemer@gmail.com'
-__copyright__ = 'Copyright (c) 2010-2015, %s <%s>' % (__author__, __email__)
+__copyright__ = 'Copyright (c) 2010-2016, %s <%s>' % (__author__, __email__)
 __credits__ = []
 __license__ = 'MIT License'
-__version__ = '0.5.2'
+__version__ = '0.5.3'
 __maintainer__ = 'Nico Schlömer'
 __status__ = 'Production'
 

matplotlib2tikz/legend.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-
+import warnings
 
 def draw_legend(data, obj):
     '''Adds legend code to the EXTRA_AXIS_OPTIONS.

matplotlib2tikz/line2d.py

@@ -3,6 +3,7 @@
 from . import color as mycol
 from . import path as mypath
 
+import numpy
 
 def draw_line2d(data, obj):
     '''Returns the PGFPlots code for an Line2D environment.
@@ -118,7 +119,7 @@ def draw_linecollection(data, obj):
     linestyles = obj.get_linestyles()
     linewidths = obj.get_linewidths()
     paths = obj.get_paths()
-    
+
     for i in range(len(paths)):
         path = paths[i]
         if i < len(edgecolors):
@@ -135,21 +136,21 @@ def draw_linecollection(data, obj):
             width = linewidths[0]
 
         data, options = mypath.get_draw_options(data, color, None)
-        
+
         width = _mpl_linewidth2pgfp_linewidth(data, width)
         if width:
             options.append(width)
-        
+
         if style[0] is not None:
             show_line, linestyle = _mpl_linestyle2pgfp_linestyle(style)
             if show_line and linestyle:
                 options.append(linestyle)
-            
+
         # TODO what about masks?
         data, cont = mypath.draw_path(obj, data, path,
                                 draw_options=options,
                                 simplify=False)
-        
+
         content.append(cont)
 
     return data, content

matplotlib2tikz/path.py

@@ -115,7 +115,7 @@ def draw_pathcollection(data, obj):
     elif obj.get_paths():
         # Not sure if we need this here at all.
         for path in obj.get_paths():
-            data, cont = _draw_path(
+            data, cont = draw_path(
                 obj, data, path, draw_options=draw_options
                 )
             content.append(cont)

setup.py

@@ -34,6 +34,8 @@ def read(fname):
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
+        'Programming Language :: Python 2',
+        'Programming Language :: Python 3',
         'Topic :: Multimedia :: Graphics :: Graphics Conversion'
         ]
     )