updates after renaming

merenlin · merenlin · commit 819e41e19c88 · 2015-08-04T13:04:17.000+02:00
diff --git a/plotly/tests/test_core/test_tools/test_figure_factory.py b/plotly/tests/test_core/test_tools/test_figure_factory.py
@@ -807,10 +807,10 @@ def test_datetime_candlestick(self):
 class TestDendrogram(TestCase):
 
     def test_default_dendrogram(self):
-        dendro = tls.TraceFactory.create_dendrogram(X=[[1, 2, 3, 4],
+        dendro = tls.FigureFactory.create_dendrogram(X=np.array([[1, 2, 3, 4],
                                                        [1, 1, 3, 4],
                                                        [1, 2, 1, 4],
-                                                       [1, 2, 3, 1]])
+                                                       [1, 2, 3, 1]]))
         expected_dendro_data = [{'marker': {'color': 'rgb(255,133,27)'},
                                  'mode': 'lines', 'xaxis': 'xs',
                                  'yaxis': 'ys',
@@ -844,7 +844,7 @@ def test_dendrogram_random_matrix(self):
         # variable 2 is correlated with all the other variables
         X[2,:] = sum(X,0)
 
-        dendro = tls.TraceFactory.create_dendrogram(X)
+        dendro = tls.FigureFactory.create_dendrogram(X)
 
         # Check that 2 is in a separate cluster
         self.assertEqual(dendro.labels[0], '2')
diff --git a/plotly/tools.py b/plotly/tools.py
@@ -2711,8 +2711,6 @@ def sum_streamlines(self):
         streamline_y = sum(self.st_y, [])
         return streamline_x, streamline_y
 
-<<<<<<< HEAD
-
 class _OHLC(FigureFactory):
     """
     Refer to FigureFactory.create_ohlc_increase() for docstring.
@@ -2893,7 +2891,7 @@ def get_candle_decrease(self):
         return (decrease_x, decrease_close, decrease_dif,
                 stick_decrease_y, stick_decrease_x)
 
-class _Dendrogram(TraceFactory):
+class _Dendrogram(FigureFactory):
     ''' Returns a Dendrogram figure object
         Example usage:
         D = Dendrogram( Z )
