Revamp streaming

plotly/__init__.py

@@ -28,5 +28,6 @@
 
 from __future__ import absolute_import
 
-from plotly import plotly, graph_objs, grid_objs, tools, utils, session, offline
+from plotly import (plotly, graph_objs, grid_objs, tools, utils, session,
+                    offline)
 from plotly.version import __version__

plotly/exceptions.py

@@ -15,21 +15,14 @@
 
 
 """
-import sys
-import six
+import json
 
-if sys.version[:3] == '2.6':
-    import simplejson as json
-else:
-    import json
-
-## Base Plotly Error ##
 
+# Base Plotly Error
 class PlotlyError(Exception):
     pass
 
 
-
 class InputError(PlotlyError):
     pass
 
@@ -63,8 +56,7 @@ def __str__(self):
         return self.message
 
 
-## Grid Errors ##
-
+# Grid Errors #
 COLUMN_NOT_YET_UPLOADED_MESSAGE = (
     "Hm... it looks like your column '{column_name}' hasn't "
     "been uploaded to Plotly yet. You need to upload your "
@@ -79,14 +71,14 @@ def __str__(self):
     "can't have duplicate column names. Rename "
     "the column \"{0}\" and try again."
 )
-## Would Cause Server Errors ##
+
+# Would Cause Server Errors
 
 class PlotlyEmptyDataError(PlotlyError):
     pass
 
 
-## Graph Objects Errors ##
-
+# Graph Objects Errors
 class PlotlyGraphObjectError(PlotlyError):
     def __init__(self, message='', path=None, notes=None, plain_message=''):
         self.message = message
@@ -202,8 +194,7 @@ def __init__(self, obj='', index='', **kwargs):
                                                   **kwargs)
 
 
-## Local Config Errors ##
-
+# Local Config Errors
 class PlotlyLocalError(PlotlyError):
     pass
 
@@ -224,8 +215,7 @@ def __init__(self):
         super(PlotlyLocalCredentialsError, self).__init__(message)
 
 
-## Server Errors ##
-
+# Server Errors
 class PlotlyServerError(PlotlyError):
     pass
 
@@ -244,3 +234,20 @@ class PlotlyAccountError(PlotlyServerError):
 
 class PlotlyRateLimitError(PlotlyServerError):
     pass
+
+
+class ClosedConnection(PlotlyConnectionError):
+    """Raised when the Plotly streaming server has disconnected."""
+    def __init__(self, message, status_code=None):
+        self.message = "[Code: {}] {}".format(status_code, message)
+        self.status_code = status_code or None
+        super(ClosedConnection, self).__init__(self.message)
+
+
+class TooManyConnectFailures(PlotlyConnectionError):
+    """Raised when too many unsuccessful (re)connects were attempted"""
+    message = "Connecting or reconnecting to stream failed too many times."
+
+    def __init__(self, message=None):
+        message = message or self.message
+        super(TooManyConnectFailures, self).__init__(message)

plotly/graph_objs/graph_objs.py

@@ -24,23 +24,19 @@
 """
 from __future__ import absolute_import
 
+import copy
+import sys
 import warnings
+from collections import OrderedDict
+
 import six
+
+from plotly import exceptions, utils
 from plotly.graph_objs import graph_objs_tools
 from plotly.graph_objs.graph_objs_tools import (
     INFO, OBJ_MAP, NAME_TO_KEY, KEY_TO_NAME
 )
 
-from plotly import exceptions
-from plotly import utils
-
-import copy
-import sys
-if sys.version[:3] == '2.6':
-    from ordereddict import OrderedDict
-else:
-    from collections import OrderedDict
-
 __all__ = None
 
 

plotly/graph_objs/graph_objs_tools.py

@@ -1,25 +1,14 @@
 from __future__ import absolute_import
-from plotly import utils
-import textwrap
+
+import json
 import os
-import sys
-if sys.version[:3] == '2.6':
-    try:
-        from ordereddict import OrderedDict
-        import simplejson as json
-    except ImportError:
-        raise ImportError(
-            "Looks like you're running Python 2.6. Plotly expects newer "
-            "standard library versions of ordereddict and json. You can "
-            "simply upgrade with these 'extras' with the following terminal "
-            "command:\npip install 'plotly[PY2.6]'"
-        )
-else:
-    from collections import OrderedDict
-    import json
+import textwrap
+from collections import OrderedDict
+from pkg_resources import resource_string
+
 import six
 
-from pkg_resources import resource_string
+from plotly import utils
 
 
 # Define graph reference loader

plotly/grid_objs/__init__.py

@@ -3,6 +3,6 @@
 =========
 
 """
+from __future__ import absolute_import
 
-
-from . grid_objs import Grid, Column
+from plotly.grid_objs.grid_objs import Grid, Column

plotly/grid_objs/grid_objs.py

@@ -5,15 +5,10 @@
 """
 from __future__ import absolute_import
 
-import sys
+import json
 from collections import MutableSequence
-from plotly import exceptions
-from plotly import utils
 
-if sys.version[:3] == '2.6':
-    import simplejson as json
-else:
-    import json
+from plotly import exceptions, utils
 
 __all__ = None
 

plotly/matplotlylib/__init__.py

@@ -9,5 +9,7 @@
 'tools' module or 'plotly' package.
 
 """
-from . renderer import PlotlyRenderer
-from . mplexporter import Exporter
+from __future__ import absolute_import
+
+from plotly.matplotlylib.renderer import PlotlyRenderer
+from plotly.matplotlylib.mplexporter import Exporter

plotly/matplotlylib/mpltools.py

@@ -4,9 +4,9 @@
 A module for converting from mpl language to plotly language.
 
 """
-
 import math
 import warnings
+
 import matplotlib.dates
 import pytz
 

plotly/matplotlylib/renderer.py

@@ -10,9 +10,9 @@
 
 import warnings
 
-from . mplexporter import Renderer
-from . import mpltools
 import plotly.graph_objs as go
+from plotly.matplotlylib.mplexporter import Renderer
+from plotly.matplotlylib import mpltools
 
 
 # Warning format

plotly/offline/offline.py

@@ -5,15 +5,14 @@
 """
 from __future__ import absolute_import
 
-import uuid
 import json
 import os
+import uuid
+
 import requests
 
-from plotly import utils
-from plotly import tools
+from plotly import session, tools, utils
 from plotly.exceptions import PlotlyError
-from plotly import session
 
 PLOTLY_OFFLINE_DIRECTORY = plotlyjs_path = os.path.expanduser(
     os.path.join(*'~/.plotly/plotlyjs'.split('/')))

plotly/plotly/__init__.py

@@ -18,6 +18,7 @@
     plot_mpl,
     get_figure,
     Stream,
+    StreamWriter,
     image,
     grid_ops,
     meta_ops,