change width of ohlc to 1

- set ohlc width to 1
- remove duplicate names in tests

Author: cldougl

plotly/tests/test_core/test_tools/test_figure_factory.py

@@ -130,31 +130,31 @@ def test_one_ohlc(self):
 
         # This should create one "increase" (i.e. close > open) ohlc stick
 
-        ohlc_incr = tls.FigureFactory.create_ohlc(open=[33.0],
-                                                  high=[33.2],
-                                                  low=[32.7],
-                                                  close=[33.1])
-
-        expected_ohlc_incr = {'layout': {'hovermode': 'closest',
-                                         'xaxis': {'zeroline': False}},
-                              'data': [{'y': [33.0, 33.0, 33.2, 32.7,
-                                              33.1, 33.1, None],
-                                        'line': {'width': 1,
-                                                 'color': '#3D9970'},
-                                        'showlegend': False,
-                                        'name': 'Increasing',
-                                        'text': ('Open', 'Open', 'High', 'Low',
-                                                 'Close', 'Close', ''),
-                                        'mode': 'lines', 'type': 'scatter',
-                                        'x': [-0.2, 0, 0, 0, 0, 0.2, None]},
-                                       {'y': [], 'line': {'width': 1,
-                                                          'color': '#FF4136'},
-                                        'showlegend': False,
-                                        'name': 'Decreasing', 'text': (),
-                                        'mode': 'lines', 'type': 'scatter',
-                                        'x': []}]}
-
-        self.assertEqual(ohlc_incr, expected_ohlc_incr)
+        ohlc = tls.FigureFactory.create_ohlc(open=[33.0],
+                                             high=[33.2],
+                                             low=[32.7],
+                                             close=[33.1])
+
+        expected_ohlc = {'layout': {'hovermode': 'closest',
+                                    'xaxis': {'zeroline': False}},
+                         'data': [{'y': [33.0, 33.0, 33.2, 32.7,
+                                         33.1, 33.1, None],
+                                   'line': {'width': 1,
+                                            'color': '#3D9970'},
+                                   'showlegend': False,
+                                   'name': 'Increasing',
+                                   'text': ('Open', 'Open', 'High', 'Low',
+                                            'Close', 'Close', ''),
+                                   'mode': 'lines', 'type': 'scatter',
+                                   'x': [-0.2, 0, 0, 0, 0, 0.2, None]},
+                                  {'y': [], 'line': {'width': 1,
+                                                     'color': '#FF4136'},
+                                   'showlegend': False,
+                                   'name': 'Decreasing', 'text': (),
+                                   'mode': 'lines', 'type': 'scatter',
+                                   'x': []}]}
+
+        self.assertEqual(ohlc, expected_ohlc)
 
     def test_one_ohlc_increase(self):
 
@@ -294,11 +294,11 @@ def test_datetime_ohlc(self):
              datetime.datetime(year=2014, month=9, day=4),
              datetime.datetime(year=2014, month=12, day=5)]
 
-        ohlc = tls.FigureFactory.create_ohlc(open_data, high_data,
-                                             low_data, close_data,
-                                             dates=x)
+        ohlc_d = tls.FigureFactory.create_ohlc(open_data, high_data,
+                                               low_data, close_data,
+                                               dates=x)
 
-        expe_ohlc = {'data': [{'line': {'color': '#3D9970', 'width': 1},
+        ex_ohlc_d = {'data': [{'line': {'color': '#3D9970', 'width': 1},
                                'mode': 'lines',
                                'name': 'Increasing',
                                'showlegend': False,
@@ -478,7 +478,7 @@ def test_datetime_ohlc(self):
                                      None]}],
                      'layout': {'hovermode': 'closest',
                                 'xaxis': {'zeroline': False}}}
-        self.assertEqual(ohlc, expe_ohlc)
+        self.assertEqual(ohlc_d, ex_ohlc_d)
 
     def test_datetime_candlestick(self):
 

plotly/tools.py

@@ -2187,7 +2187,8 @@ def _make_increasing_ohlc(open, high, low, close, dates, **kwargs):
             kwargs.setdefault('name', 'Increasing')
             showlegend = False
 
-        kwargs.setdefault('line', dict(color=_DEFAULT_INCREASING_COLOR))
+        kwargs.setdefault('line', dict(color=_DEFAULT_INCREASING_COLOR,
+                                       width=1))
         kwargs.setdefault('text', text_increase)
 
         ohlc_incr = dict(type='scatter',
@@ -2218,7 +2219,8 @@ def _make_decreasing_ohlc(open, high, low, close, dates, **kwargs):
          flat_decrease_y,
          text_decrease) = _OHLC(open, high, low, close, dates).get_decrease()
 
-        kwargs.setdefault('line', dict(color=_DEFAULT_DECREASING_COLOR))
+        kwargs.setdefault('line', dict(color=_DEFAULT_DECREASING_COLOR,
+                                       width=1))
         kwargs.setdefault('text', text_decrease)
         kwargs.setdefault('showlegend', False)
         kwargs.setdefault('name', 'Decreasing')
@@ -2628,13 +2630,10 @@ def create_candlestick(open, high, low, close,
         py.iplot(fig, filename='finance/simple-candlestick', validate=False)
         ```
         """
-        FigureFactory.validate_ohlc(open, high, low, close, direction,
-                                    **kwargs)
         if dates is not None:
             TraceFactory.validate_equal_length(open, high, low, close, dates)
         else:
             TraceFactory.validate_equal_length(open, high, low, close)
-
         FigureFactory.validate_ohlc(open, high, low, close, direction,
                                     **kwargs)