Fix color assignments, ticks line widths and some pep-8 improvements

backtrader · backtrader · commit 72ba42290c40 · 2020-05-28T04:13:14.000+02:00
diff --git a/backtrader/plot/finance.py b/backtrader/plot/finance.py
@@ -27,8 +27,6 @@
 import matplotlib.colors as mcolors
 import matplotlib.legend as mlegend
 import matplotlib.lines as mlines
-import matplotlib.patches as mpatches
-import matplotlib.transforms as mtransforms
 
 from .utils import shade_color
 
@@ -134,9 +132,9 @@ def barcollection(self,
                       **kwargs):
 
         # Prepack different zips of the series values
-        oc = lambda: zip(opens, closes)
-        xoc = lambda: zip(xs, opens, closes)
-        iohlc = lambda: zip(xs, opens, highs, lows, closes)
+        oc = lambda: zip(opens, closes)  # NOQA: E731
+        xoc = lambda: zip(xs, opens, closes)  # NOQA: E731
+        iohlc = lambda: zip(xs, opens, highs, lows, closes)  # NOQA: E731
 
         colorup = self.colorup if fillup else 'None'
         colordown = self.colordown if filldown else 'None'
@@ -147,7 +145,7 @@ def barcollection(self,
         edgecolors = [edgecolord[o < c] for o, c in oc()]
 
         tickcolord = {True: self.tickup, False: self.tickdown}
-        tickcolors = [edgecolord[o < c] for o, c in oc()]
+        tickcolors = [tickcolord[o < c] for o, c in oc()]
 
         delta = width / 2 - edgeadjust
 
@@ -313,7 +311,7 @@ def barcollection(self,
                       **kwargs):
 
         # Prepare the data
-        openclose = lambda: zip(opens, closes)
+        openclose = lambda: zip(opens, closes)  # NOQA: E731
 
         # Calculate bars colors
         colord = {True: self.colorup, False: self.colordown}
@@ -437,10 +435,10 @@ def barcollection(self,
                       **kwargs):
 
         # Prepack different zips of the series values
-        ihighlow = lambda: zip(xs, highs, lows)
-        iopen = lambda: zip(xs, opens)
-        iclose = lambda: zip(xs, closes)
-        openclose = lambda: zip(opens, closes)
+        ihighlow = lambda: zip(xs, highs, lows)  # NOQA: E731
+        iopen = lambda: zip(xs, opens)  # NOQA: E731
+        iclose = lambda: zip(xs, closes)  # NOQA: E731
+        openclose = lambda: zip(opens, closes)  # NOQA: E731
 
         colord = {True: self.colorup, False: self.colordown}
         colors = [colord[open < close] for open, close in openclose()]
@@ -473,7 +471,7 @@ def tickopen(i, open):
             openticks,
             colors=colors,
             antialiaseds=useaa,
-            linewidths=lw,
+            linewidths=tlw,
             label='_nolegend',
             **kwargs)
 
@@ -486,7 +484,7 @@ def tickclose(i, close):
             closeticks,
             colors=colors,
             antialiaseds=useaa,
-            linewidths=lw,
+            linewidths=tlw,
             label='_nolegend',
             **kwargs)
 
