revert unnecessary changes

DanielGoldfarb · DanielGoldfarb · commit cc9ac59c03a2 · 2021-02-11T23:25:21.000-05:00
diff --git a/examples/scratch_pad/stash_plotting.yscale.py b/examples/scratch_pad/stash_plotting.yscale.py
@@ -86,7 +86,7 @@ def _valid_plot_kwargs():
                                                                    and all(isinstance(c, str) for c in value) },
         'type'                      : { 'Default'     : 'ohlc',
                                         'Validator'   : lambda value: value in ('candle','candlestick','ohlc','ohlc_bars',
-                                                                                'line','renko','pnf','hollow_candle') },
+                                                                                'line','renko','pnf') },
  
         'style'                     : { 'Default'     : 'default',
                                         'Validator'   : lambda value: value in _styles.available_styles() or isinstance(value,dict) },
diff --git a/src/mplfinance/_candelstick_new_docstring.py b/src/mplfinance/_candelstick_new_docstring.py
@@ -0,0 +1,7 @@
+"""Represent today's open to close as a "bar" line (candle body)
+and high low range as a vertical line (candle wick)
+
+If config['type']=='hnf_candle' (hollow and filled candles) then
+candle edge and wick color depend on PREVIOUS close to today's close (up or down),
+and the center of the candle body depends on the today's open to close (up or down).
+"""
diff --git a/src/mplfinance/_styledata/binance.py b/src/mplfinance/_styledata/binance.py
@@ -1,6 +1,6 @@
 style = dict(style_name    = 'binance',
              base_mpl_style= 'seaborn-darkgrid',
-             marketcolors  = {'candle'  : {'up':'#70a800', 'down':'#ea0070', 'up_hollow':'#70a800', 'down_hollow':'#ea0070'},
+             marketcolors  = {'candle'  : {'up':'#70a800', 'down':'#ea0070'},
                               'edge'    : {'up':'#70a800', 'down':'#ea0070'},
                               'wick'    : {'up':'#70a800', 'down':'#ea0070'},
                               'ohlc'    : {'up':'#70a800', 'down':'#ea0070'},
diff --git a/src/mplfinance/_styledata/blueskies.py b/src/mplfinance/_styledata/blueskies.py
@@ -1,6 +1,6 @@
 style = dict(style_name    = 'blueskies',
              base_mpl_style='fast', 
-             marketcolors  = {'candle'  : {'up':'w', 'down':'#0095ff', 'up_hollow':'w_hollow', 'down':'#0095ff'},
+             marketcolors  = {'candle'  : {'up':'w', 'down':'#0095ff'},
                               'edge'    : {'up':'k', 'down':'#0095ff'},
                               'wick'    : {'up':'k', 'down':'#0095ff'},
                               'ohlc'    : {'up':'#0095ff', 'down':'#0095ff'},
diff --git a/src/mplfinance/_styledata/brasil.py b/src/mplfinance/_styledata/brasil.py
@@ -1,5 +1,5 @@
 style = {'base_mpl_style': 'fast',
-         'marketcolors': {'candle': {'up': '#fedf00', 'down': '#002776', 'up_hollow': '#fedf00', 'down_hollow': '#002776'},
+         'marketcolors': {'candle': {'up': '#fedf00', 'down': '#002776'},
                           'edge'  : {'up': '#fedf00', 'down': '#002776'},
                           'wick'  : {'up': '#fedf00', 'down': '#002776'},
                           'ohlc'  : {'up': '#fedf00', 'down': '#002776'},
diff --git a/src/mplfinance/_styledata/charles.py b/src/mplfinance/_styledata/charles.py
@@ -1,6 +1,6 @@
 style = dict(style_name    = 'charles',
              base_mpl_style= 'fast', 
-             marketcolors  = {'candle'  : {'up':'#006340', 'down':'#a02128', 'up_hollow':'#006340', 'down_hollow':'#a02128'},
+             marketcolors  = {'candle'  : {'up':'#006340', 'down':'#a02128'},
                               'edge'    : {'up':'#006340', 'down':'#a02128'},
                               'wick'    : {'up':'#006340', 'down':'#a02128'},
                               'ohlc'    : {'up':'#006340', 'down':'#a02128'},
diff --git a/src/mplfinance/_styledata/checkers.py b/src/mplfinance/_styledata/checkers.py
@@ -1,5 +1,5 @@
 style = {'base_mpl_style': 'ggplot',
-         'marketcolors'  : {'candle': {'up': '#000000', 'down': '#ff0000', 'up_hollow': '#000000', 'down_hollow': '#ff0000'},
+         'marketcolors'  : {'candle': {'up': '#000000', 'down': '#ff0000'},
                             'edge'  : {'up': '#000000', 'down': '#ff0000'},
                             'wick'  : {'up': '#606060', 'down': '#606060'},
                             'ohlc'  : {'up': '#000000', 'down': '#ff0000'},
diff --git a/src/mplfinance/_styledata/classic.py b/src/mplfinance/_styledata/classic.py
@@ -1,6 +1,6 @@
 style = dict(style_name    = 'classic',
              base_mpl_style= 'fast', 
-             marketcolors  = {'candle'  : {'up':'w', 'down':'k', 'up_hollow':'w', 'down_hollow':'k'},
+             marketcolors  = {'candle'  : {'up':'w', 'down':'k'},
                               'edge'    : {'up':'k', 'down':'k'},
                               'wick'    : {'up':'k', 'down':'k'},
                               'ohlc'    : {'up':'k', 'down':'k'},
diff --git a/src/mplfinance/_styledata/default.py b/src/mplfinance/_styledata/default.py
@@ -1,6 +1,6 @@
 style = dict(style_name    = 'default',
              base_mpl_style= 'seaborn-darkgrid', 
-             marketcolors  = {'candle'  : {'up':'w', 'down':'k', 'up':'w', 'down':'k'},
+             marketcolors  = {'candle'  : {'up':'w', 'down':'k'},
                               'edge'    : {'up':'k', 'down':'k'},
                               'wick'    : {'up':'k', 'down':'k'},
                               'ohlc'    : {'up':'k', 'down':'k'},
diff --git a/src/mplfinance/_styledata/mike.py b/src/mplfinance/_styledata/mike.py
@@ -1,6 +1,6 @@
 style = dict(style_name    = 'mike',
              base_mpl_style= 'dark_background', 
-             marketcolors  = {'candle'  : {'up':'#000000', 'down':'#0080ff', 'up_hollow':'#000000', 'down_hollow':'#0080ff'},
+             marketcolors  = {'candle'  : {'up':'#000000', 'down':'#0080ff'},
                               'edge'    : {'up':'#ffffff', 'down':'#0080ff'},
                               'wick'    : {'up':'#ffffff', 'down':'#ffffff'},
                               'ohlc'    : {'up':'#ffffff', 'down':'#ffffff'},
diff --git a/src/mplfinance/_styledata/nightclouds.py b/src/mplfinance/_styledata/nightclouds.py
@@ -1,6 +1,6 @@
 style = dict(style_name    = 'nightclouds',
              base_mpl_style='dark_background', 
-             marketcolors  = {'candle'  : {'up':'w', 'down':'#0095ff', 'up_hollow':'w', 'down_hollow':'#0095ff'},
+             marketcolors  = {'candle'  : {'up':'w', 'down':'#0095ff'},
                               'edge'    : {'up':'w', 'down':'#0095ff'},
                               'wick'    : {'up':'w', 'down':'w'},
                               'ohlc'    : {'up':'w', 'down':'w'},
diff --git a/src/mplfinance/_styledata/starsandstripes.py b/src/mplfinance/_styledata/starsandstripes.py
@@ -1,5 +1,5 @@
 style = {'base_mpl_style': 'fast',
-         'marketcolors': {'candle': {'up': '#082865', 'down': '#ae0019', 'up_hollow': '#082865', 'down_hollow': '#ae0019'},
+         'marketcolors': {'candle': {'up': '#082865', 'down': '#ae0019'},
                           'edge'  : {'up': '#082865', 'down': '#ae0019'},
                           'wick'  : {'up': '#082865', 'down': '#ae0019'},
                           'ohlc'  : {'up': '#082865', 'down': '#ae0019'},
diff --git a/src/mplfinance/_styledata/yahoo.py b/src/mplfinance/_styledata/yahoo.py
@@ -1,5 +1,5 @@
 style = {'base_mpl_style': 'fast',
-         'marketcolors'  : {'candle': {'up': '#00b060', 'down': '#fe3032', 'up_hollow': '#00b060', 'down_hollow': '#fe3032'},
+         'marketcolors'  : {'candle': {'up': '#00b060', 'down': '#fe3032'},
                             'edge'  : {'up': '#00b060', 'down': '#fe3032'},
                             'wick'  : {'up': '#606060', 'down': '#606060'},
                             'ohlc'  : {'up': '#00b060', 'down': '#fe3032'},
diff --git a/src/mplfinance/_utils.py b/src/mplfinance/_utils.py
@@ -171,7 +171,7 @@ def _updownhollow_colors(upcolor,downcolor,hollowcolor,opens,closes):
     umap = {True : hollowcolor, False : upcolor  }
     dmap = {True : hollowcolor, False : downcolor}
     first = umap[closes[0] > opens[0]]
-    _list = [ umap[cls > opn] if cls > cls0 else dmap[cls > opn] for opn0,cls0,opn,cls in zip(opens[0:-1],closes[0:-1],opens[1:],closes[1:]) ]
+    _list = [ umap[cls > opn] if cls > cls0 else dmap[cls > opn] for cls0,opn,cls in zip(closes[0:-1],opens[1:],closes[1:]) ]
     return [first] + _list
 
 
