attempt to fix import errors

Author: chriddyp

plotly/graph_objs/graph_objs.py

@@ -30,10 +30,11 @@
 from plotly.graph_objs.graph_objs_tools import (
     INFO, OBJ_MAP, NAME_TO_KEY, KEY_TO_NAME
 )
-from plotly.grid_objs.grid_objs import Column
-import copy
+
 from plotly import exceptions
 from plotly import utils
+
+import copy
 import sys
 if sys.version[:3] == '2.6':
     from ordereddict import OrderedDict
@@ -302,7 +303,6 @@ def __init__(self, *args, **kwargs):
 
         for key in kwargs:
             if utils.is_source_key(key):
-                #if src in kwargs and isinstance(kwargs[src], Column):
                 kwargs[key] = self._assign_id_to_src(key, kwargs[key])
 
         super(PlotlyDict, self).__init__(*args, **kwargs)
@@ -341,17 +341,9 @@ def _assign_id_to_src(self, src_name, src_value):
                 raise exceptions.InputError(err)
 
         if src_id == '':
-            if isinstance(src_value, Column):
-                err = exceptions.COLUMN_NOT_YET_UPLOADED_MESSAGE
-                err.format(column_name=src_value.name, reference=src_name)
-                raise exceptions.InputError(err)
-            else:
-                err = ("{} should be a unique identifier "
-                       "string assigned by the Plotly "
-                       "server to this to this grid column, "
-                       "not an empty string.".format(src_name))
-                raise exceptions.InputError(err)
-
+            err = exceptions.COLUMN_NOT_YET_UPLOADED_MESSAGE
+            err.format(column_name=src_value.name, reference=src_name)
+            raise exceptions.InputError(err)
         return src_id
 
     def update(self, dict1=None, **dict2):

plotly/grid_objs/grid_objs.py

@@ -3,12 +3,15 @@
 =========
 
 """
+from __future__ import absolute_import
+
 
 import json
 from collections import MutableSequence
 from plotly import exceptions
 import plotly
 
+__all__ = None
 
 class Column(object):
     def __init__(self, data, name):

plotly/utils.py

@@ -12,7 +12,7 @@
 import threading
 import re
 
-import grid_objs
+import plotly
 
 ### incase people are using threading, we lock file reads
 lock = threading.Lock()
@@ -129,7 +129,7 @@ def sageJSONEncoder(self, obj):
         return None
 
     def ColumnJSONEncoder(self, obj):
-        if isinstance(obj, grid_objs.Column):
+        if isinstance(obj, plotly.grid_objs.Column):
             return {'name': obj.name, 'data': obj.data}
         else:
             return None