flake8 fixes

Author: theRealSuperMario

test/test_cleanfigure.py

@@ -22,12 +22,13 @@ def test_recursive_cleanfigure():
 
 def test_pruneOutsideBox():
     """test against matlab2tikz implementation
-    
-    octave code to generate baseline results. Note that octave has indexing 1...N, whereas python has indexing 0...N-1.
+
+    octave code to generate baseline results. 
+    Note that octave has indexing 1...N, whereas python has indexing 0...N-1.
     ```octave
         x = linspace(1, 100, 20);
         y1 = linspace(1, 100, 20);
-    
+
         figure
         plot(x, y1)
         xlim([20, 80])
@@ -50,13 +51,14 @@ def test_pruneOutsideBox():
 
 
 def test_replaceDataWithNaN():
-    """test against matlab2tikz implementation
-    
-    octave code to generate baseline results. Note that octave has indexing 1...N, whereas python has indexing 0...N-1.
+    """test against matlab2tikz implementation.
+
+    octave code to generate baseline results. 
+    Note that octave has indexing 1...N, whereas python has indexing 0...N-1.
     ```octave
         x = linspace(1, 100, 20);
         y1 = linspace(1, 100, 20);
-    
+
         figure
         plot(x, y1)
         xlim([20, 80])
@@ -83,13 +85,14 @@ def test_replaceDataWithNaN():
 
 
 def test_removeData():
-    """test against matlab2tikz implementation
-    
-    octave code to generate baseline results. Note that octave has indexing 1...N, whereas python has indexing 0...N-1.
+    """test against matlab2tikz implementation.
+
+    octave code to generate baseline results. 
+    Note that octave has indexing 1...N, whereas python has indexing 0...N-1.
     ```octave
         x = linspace(1, 100, 20);
         y1 = linspace(1, 100, 20);
-    
+
         figure
         plot(x, y1)
         xlim([20, 80])
@@ -102,7 +105,6 @@ def test_removeData():
     id_remove = np.array([1, 2, 3, 17, 18, 19])
     xData = np.linspace(1, 100, 20)
     yData = xData.copy()
-    data = np.stack([xData, yData], axis=1)
 
     with plt.rc_context(rc=RC_PARAMS):
         fig, ax = plt.subplots(1, 1, figsize=(5, 5))
@@ -134,7 +136,6 @@ def test_removeNaNs():
     id_remove = np.array([1, 2, 3, 17, 18, 19])
     xData = np.linspace(1, 100, 20)
     yData = xData.copy()
-    data = np.stack([xData, yData], axis=1)
 
     with plt.rc_context(rc=RC_PARAMS):
         fig, ax = plt.subplots(1, 1, figsize=(5, 5))
@@ -178,10 +179,10 @@ def test_getVisualLimits():
     """octave code
         ```octave
             addpath ("../matlab2tikz/src")
-    
+
             x = linspace(1, 100, 20);
             y1 = linspace(1, 100, 20);
-    
+
             figure
             plot(x, y1)
             xlim([20, 80])
@@ -210,10 +211,10 @@ def test_movePointsCloser():
     """octave code
         ```octave
             addpath ("../matlab2tikz/src")
-    
+
             x = linspace(1, 100, 20);
             y1 = linspace(1, 100, 20);
-    
+
             figure
             plot(x, y1)
             xlim([20, 80])
@@ -491,7 +492,6 @@ def test_hist(self):
 
     def test_plot3d(self):
         """ """
-        from mpl_toolkits.mplot3d import Axes3D
 
         theta = np.linspace(-4 * np.pi, 4 * np.pi, 100)
         z = np.linspace(-2, 2, 100)
@@ -519,7 +519,6 @@ def test_plot3d(self):
 
     def test_scatter3d(self):
         """ """
-        from mpl_toolkits.mplot3d import Axes3D
 
         x, y = np.meshgrid(np.linspace(1, 100, 20), np.linspace(1, 100, 20))
         z = np.abs(x - 50) + np.abs(y - 50)
@@ -552,7 +551,6 @@ def test_wireframe3D(self):
 
     def test_surface3D(self):
         """ """
-        from mpl_toolkits.mplot3d import Axes3D
         from matplotlib import cm
         from matplotlib.ticker import LinearLocator, FormatStrFormatter
 
@@ -589,7 +587,6 @@ def test_trisurface3D(Self):
         :param Self: 
 
         """
-        from mpl_toolkits.mplot3d import Axes3D
         import matplotlib.pyplot as plt
         import numpy as np
 
@@ -636,7 +633,6 @@ def test_contour3D(self):
 
     def test_polygon3D(self):
         """ """
-        from mpl_toolkits.mplot3d import Axes3D
         from matplotlib.collections import PolyCollection
         from matplotlib import colors as mcolors
 
@@ -677,7 +673,6 @@ def cc(arg):
 
     def test_bar3D(self):
         """ """
-        from mpl_toolkits.mplot3d import Axes3D
         import matplotlib.pyplot as plt
         import numpy as np
 
@@ -702,7 +697,6 @@ def test_bar3D(self):
 
     def test_quiver3D(self):
         """ """
-        from mpl_toolkits.mplot3d import axes3d
         import matplotlib.pyplot as plt
         import numpy as np
 
@@ -733,7 +727,6 @@ def test_quiver3D(self):
 
     def test_2D_in_3D(self):
         """ """
-        from mpl_toolkits.mplot3d import Axes3D
         import numpy as np
         import matplotlib.pyplot as plt
 

tikzplotlib/cleanfigure.py

@@ -2,16 +2,14 @@
 import matplotlib as mpl
 from matplotlib import pyplot as plt
 import mpl_toolkits
-from mpl_toolkits.mplot3d import Axes3D
 
 
-# TODO: change docstring type [!!!]
-# TODO: see which test cases the matlab2tikz guys used [!]
+# TODO: see which test cases the matlab2tikz guys used [!!!]
+# TODO: find suitable test cases for remaining functions. [!!]
 # TODO: implement remaining functions [!!]
 # - simplify stair : plt.step
 # -- looks like matlabs stairs plot and matplotlibs plt.step is implemented differently. The data representation is different.
 # - there is still a missing code block in movePointsCloser. Maybe find suitable axes limits to get this code block to work
-# TODO: find suitable test cases for remaining functions.
 # TODO: make grid of plot types which are working and which not. 2D and 3D
 
 
@@ -597,8 +595,8 @@ def _movePointscloser(fighandle, axhandle, linehandle):
         X1_second = data[id_second, :]
         X2_second = data[id_second - 1, :]
 
-        newData_first = _moveToBox(X1_first, X2_first, largeXLim, largeYLim)
-        newData_second = _moveToBox(X1_second, X2_second, largeXLim, largeYLim)
+        newData_first = _moveToBox(X1_first, X2_first, largeXlim, largeYlim)
+        newData_second = _moveToBox(X1_second, X2_second, largeXlim, largeYlim)
 
         isXlog = linehandle.get_xscale() == "log"
         if isXlog:
@@ -686,19 +684,18 @@ def _movePointscloser(fighandle, axhandle, linehandle):
 
 
 def _moveToBox(x, xRef, xLim, yLim):
-    """
+    """Takes a box defined by xlim, ylim, a vector of points x and a vector of
+    reference points xRef.
+    Returns the vector of points xNew that sits on the line segment between
+    x and xRef *and* on the box. If several such points exist, take the
+    closest one to x.
 
     :param x: 
     :param xRef: 
     :param xLim: 
     :param yLim: 
 
     """
-    #% Takes a box defined by xlim, ylim, a vector of points x and a vector of
-    #% reference points xRef.
-    #% Returns the vector of points xNew that sits on the line segment between
-    #% x and xRef *and* on the box. If several such points exist, take the
-    #% closest one to x.
     # n = size(x, 1);
 
     # #% Find out with which border the line x---xRef intersects, and determine
@@ -724,7 +721,6 @@ def _moveToBox(x, xRef, xLim, yLim):
     # #% Create the new point
     # xNew = x + bsxfun(@times ,minAlpha, (xRef-x));
     raise NotImplementedError
-    return xNew
 
 
 def _insertData(fighandle, linehandle, id_insert, dataInsert):
@@ -778,7 +774,6 @@ def _simplifyLine(fighandle, axhandle, linehandle, target_resolution):
         return
     W, H = _getWidthHeightInPixels(fighandle, target_resolution)
     xData, yData = _getVisualData(axhandle, linehandle)
-    data = np.stack([xData, yData], axis=1)
     # Only simplify if there are more than 2 points
     if np.size(xData) <= 2 or np.size(yData) <= 2:
         return
@@ -1285,7 +1280,6 @@ def _isValidTargetResolution(val):
     """
     # TODO: implement this
     raise NotImplementedError
-    return isValid
 
 
 def _isValidAxis(val):
@@ -1296,7 +1290,6 @@ def _isValidAxis(val):
     """
     # TODO: implement this
     raise NotImplementedError
-    return isValid
 
 
 def _normalizeAxis(fighandle, axhandle):
@@ -1308,7 +1301,6 @@ def _normalizeAxis(fighandle, axhandle):
     """
     # TODO: implement this
     raise NotImplementedError
-    return isValid
 
 
 def _segmentsIntersect(X1, X2, X3, X4):