Stop doing weird protected imports for FF stuff.

Author: theengineear

plotly/figure_factory/_2d_density.py

@@ -1,7 +1,10 @@
 from __future__ import absolute_import
 
+from numbers import Number
+
 from plotly import exceptions
 from plotly.figure_factory import utils
+from plotly.graph_objs import graph_objs
 
 
 def make_linear_colorscale(colors):
@@ -83,8 +86,6 @@ def create_2d_density(x, y, colorscale='Earth', ncontours=20,
     py.iplot(fig, filename='use-parameters')
     ```
     """
-    from plotly.graph_objs import graph_objs
-    from numbers import Number
 
     # validate x and y are filled with numbers only
     for array in [x, y]:

plotly/figure_factory/_annotated_heatmap.py

@@ -2,6 +2,7 @@
 
 from plotly import exceptions
 from plotly.figure_factory import utils
+from plotly.graph_objs import graph_objs
 from plotly.tools import _numpy_imported
 
 if _numpy_imported:
@@ -82,8 +83,6 @@ def create_annotated_heatmap(z, x=None, y=None, annotation_text=None,
     py.iplot(figure)
     ```
     """
-    # TODO: protected until #282
-    from plotly.graph_objs import graph_objs
 
     # Avoiding mutables in the call signature
     font_colors = font_colors if font_colors is not None else []
@@ -120,7 +119,6 @@ class _AnnotatedHeatmap(object):
     """
     def __init__(self, z, x, y, annotation_text, colorscale,
                  font_colors, reversescale, **kwargs):
-        from plotly.graph_objs import graph_objs
 
         self.z = z
         if x:
@@ -224,7 +222,6 @@ def make_annotations(self):
         :rtype (list[dict]) annotations: list of annotations for each cell of
             the heatmap
         """
-        from plotly.graph_objs import graph_objs
         min_text_color, max_text_color = _AnnotatedHeatmap.get_text_color(self)
         z_mid = _AnnotatedHeatmap.get_z_mid(self)
         annotations = []

plotly/figure_factory/_candlestick.py

@@ -4,6 +4,7 @@
 from plotly.figure_factory._ohlc import (_DEFAULT_INCREASING_COLOR,
                                          _DEFAULT_DECREASING_COLOR,
                                          validate_ohlc)
+from plotly.graph_objs import graph_objs
 
 
 def make_increasing_candle(open, high, low, close, dates, **kwargs):
@@ -204,8 +205,6 @@ def create_candlestick(open, high, low, close, dates=None, direction='both',
     py.iplot(fig, filename='finance/simple-candlestick', validate=False)
     ```
     """
-    # TODO: protected until #282
-    from plotly.graph_objs import graph_objs
     if dates is not None:
         utils.validate_equal_length(open, high, low, close, dates)
     else:

plotly/figure_factory/_dendrogram.py

@@ -5,6 +5,7 @@
 from collections import OrderedDict
 
 from plotly import exceptions
+from plotly.graph_objs import graph_objs
 from plotly.tools import (_numpy_imported, _scipy_imported,
                           _scipy__cluster__hierarchy_imported,
                           _scipy__spatial_imported)
@@ -106,8 +107,6 @@ class _Dendrogram(object):
     def __init__(self, X, orientation='bottom', labels=None, colorscale=None,
                  width="100%", height="100%", xaxis='xaxis', yaxis='yaxis',
                  distfun=None, linkagefun=lambda x: sch.linkage(x, 'complete')):
-        # TODO: protected until #282
-        from plotly.graph_objs import graph_objs
         self.orientation = orientation
         self.labels = labels
         self.xaxis = xaxis
@@ -259,8 +258,6 @@ def get_dendrogram_traces(self, X, colorscale, distfun, linkagefun):
             (e) P['leaves']: left-to-right traversal of the leaves
 
         """
-        # TODO: protected until #282
-        from plotly.graph_objs import graph_objs
         d = distfun(X)
         Z = linkagefun(d)
         P = sch.dendrogram(Z, orientation=self.orientation,

plotly/figure_factory/_distplot.py

@@ -2,6 +2,7 @@
 
 from plotly import exceptions
 from plotly.figure_factory import utils
+from plotly.graph_objs import graph_objs
 from plotly.tools import _numpy_imported, _pandas_imported, _scipy_imported
 
 if _numpy_imported:
@@ -27,12 +28,6 @@ def validate_distplot(hist_data, curve_type):
     :raises: (PlotlyError) If curve_type is not valid (i.e. not 'kde' or
         'normal').
     """
-    try:
-        import pandas as pd
-        _pandas_imported = True
-    except ImportError:
-        _pandas_imported = False
-
     hist_data_types = (list,)
     if _numpy_imported:
         hist_data_types += (np.ndarray,)
@@ -174,8 +169,6 @@ def create_distplot(hist_data, group_labels, bin_size=1., curve_type='kde',
                                 validate=False)
     ```
     """
-    # TODO: protected until #282
-    from plotly.graph_objs import graph_objs
     validate_distplot(hist_data, curve_type)
     utils.validate_equal_length(hist_data, group_labels)
 

plotly/figure_factory/_gantt.py

@@ -1,5 +1,7 @@
 from __future__ import absolute_import
 
+from numbers import Number
+
 from plotly import exceptions
 from plotly.figure_factory import utils
 from plotly.tools import _pandas_imported
@@ -181,7 +183,6 @@ def gantt_colorscale(chart, colors, title, index_col, show_colorbar, bar_width,
     """
     Refer to FigureFactory.create_gantt() for docstring
     """
-    from numbers import Number
     if tasks is None:
         tasks = []
     if task_names is None:

plotly/figure_factory/_ohlc.py

@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 
 from plotly import exceptions
+from plotly.graph_objs import graph_objs
 from plotly.figure_factory import utils
 
 
@@ -254,8 +255,6 @@ def create_ohlc(open, high, low, close, dates=None, direction='both',
     py.iplot(fig, filename='finance/simple-ohlc', validate=False)
     ```
     """
-    # TODO: protected until #282
-    from plotly.graph_objs import graph_objs
     if dates is not None:
         utils.validate_equal_length(open, high, low, close, dates)
     else:

plotly/figure_factory/_quiver.py

@@ -3,6 +3,7 @@
 import math
 
 from plotly import exceptions
+from plotly.graph_objs import graph_objs
 from plotly.figure_factory import utils
 
 
@@ -88,8 +89,6 @@ def create_quiver(x, y, u, v, scale=.1, arrow_scale=.3,
     py.plot(fig, filename='quiver')
     ```
     """
-    # TODO: protected until #282
-    from plotly.graph_objs import graph_objs
     utils.validate_equal_length(x, y, u, v)
     utils.validate_positive_scalars(arrow_scale=arrow_scale, scale=scale)
 

plotly/figure_factory/_scatterplot.py

@@ -2,6 +2,7 @@
 
 from plotly import exceptions
 from plotly.figure_factory import utils
+from plotly.graph_objs import graph_objs
 from plotly.tools import _pandas_imported, make_subplots
 
 if _pandas_imported:
@@ -137,7 +138,6 @@ def scatterplot(dataframe, headers, diag, size, height, width, title,
     Returns fig for scatterplotmatrix without index
 
     """
-    from plotly.graph_objs import graph_objs
     dim = len(dataframe)
     fig = make_subplots(rows=dim, cols=dim, print_grid=False)
     trace_list = []
@@ -219,7 +219,6 @@ def scatterplot_dict(dataframe, headers, diag, size,
     implies that a categorical approach should be taken
 
     """
-    from plotly.graph_objs import graph_objs
 
     theme = colormap
     dim = len(dataframe)
@@ -377,7 +376,6 @@ def scatterplot_theme(dataframe, headers, diag, size, height, width, title,
     Returns fig for scatterplotmatrix with both index and colormap picked
 
     """
-    from plotly.graph_objs import graph_objs
 
     # Check if index is made of string values
     if isinstance(index_vals[0], str):

plotly/figure_factory/_streamline.py

@@ -4,6 +4,7 @@
 
 from plotly import exceptions
 from plotly.figure_factory import utils
+from plotly.graph_objs import graph_objs
 from plotly.tools import _numpy_imported
 
 if _numpy_imported:
@@ -118,8 +119,6 @@ def create_streamline(x, y, u, v, density=1, angle=math.pi / 9,
     py.plot(fig, filename='streamline')
     ```
     """
-    # TODO: protected until #282
-    from plotly.graph_objs import graph_objs
     utils.validate_equal_length(x, y)
     utils.validate_equal_length(u, v)
     validate_streamline(x, y)

plotly/figure_factory/_table.py

@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 
 from plotly import exceptions
+from plotly.graph_objs import graph_objs
 from plotly.tools import _pandas_imported
 
 if _pandas_imported:
@@ -97,8 +98,6 @@ def create_table(table_text, colorscale=None, font_colors=None,
     py.iplot(table_simple)
     ```
     """
-    # TODO: protected until #282
-    from plotly.graph_objs import graph_objs
 
     # Avoiding mutables in the call signature
     colorscale = \
@@ -139,7 +138,6 @@ class _Table(object):
     """
     def __init__(self, table_text, colorscale, font_colors, index,
                  index_title, annotation_offset, **kwargs):
-        from plotly.graph_objs import graph_objs
         if _pandas_imported and isinstance(table_text, pd.DataFrame):
             headers = table_text.columns.tolist()
             table_text_index = table_text.index.tolist()
@@ -211,7 +209,6 @@ def make_table_annotations(self):
         :rtype (list) annotations: list of annotations for each cell of the
             table.
         """
-        from plotly.graph_objs import graph_objs
         table_matrix = _Table.get_table_matrix(self)
         all_font_colors = _Table.get_table_font_color(self)
         annotations = []

plotly/figure_factory/_trisurf.py

@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 
 from plotly import colors, exceptions
+from plotly.graph_objs import graph_objs
 from plotly.tools import _numpy_imported
 
 if _numpy_imported:
@@ -83,7 +84,6 @@ def trisurf(x, y, z, simplices, show_colorbar, edges_color, scale,
     if _numpy_imported is False:
         raise ImportError("FigureFactory._trisurf() requires "
                           "numpy imported.")
-    from plotly.graph_objs import graph_objs
     points3D = np.vstack((x, y, z)).T
     simplices = np.atleast_2d(simplices)
 
@@ -455,7 +455,6 @@ def dist_origin(x, y, z):
     py.iplot(fig, filename="trisurf-plot-modern-art")
     ```
     """
-    from plotly.graph_objs import graph_objs
 
     # Validate colormap
     colors.validate_colors(colormap)