use explicit relative imports for py2 compat

Kully · Kully · commit e590fd0582fe · 2018-05-14T10:48:03.000-04:00
diff --git a/plotly/basedatatypes.py b/plotly/basedatatypes.py
@@ -1,23 +1,22 @@
 import collections
 import re
-import typing as typ
 import warnings
 from contextlib import contextmanager
 from copy import deepcopy, copy
 from pprint import PrettyPrinter
-from typing import Dict, Tuple, Union, Callable, List
 
-from plotly.optional_imports import get_module
+from .optional_imports import get_module
 
-import plotly.offline as pyo
+from . import offline as pyo
 from _plotly_utils.basevalidators import (
     CompoundValidator, CompoundArrayValidator, BaseDataValidator,
     BaseValidator)
-from plotly import animation
-from plotly.callbacks import (Points, BoxSelector, LassoSelector,
+from . import animation
+from .callbacks import (Points, BoxSelector, LassoSelector,
                               InputDeviceState)
-from plotly.utils import ElidedPrettyPrinter
-from plotly.validators import (DataValidator, LayoutValidator, FramesValidator)
+from .utils import ElidedPrettyPrinter
+from .validators import (DataValidator, LayoutValidator, FramesValidator)
+
 
 # Optional imports
 # ----------------
@@ -2260,7 +2259,7 @@ def plotly_name(self):
         return self._plotly_name
 
     @property
-    def _parent_path_str(self) -> str:
+    def _parent_path_str(self):
         """
         dot-separated path string to this object's parent.
 
@@ -2283,7 +2282,7 @@ def _parent_path_str(self) -> str:
         raise NotImplementedError
 
     @property
-    def _prop_descriptions(self) -> str:
+    def _prop_descriptions(self):
         """
         Formatted string containing all of this obejcts child properties
         and their descriptions
@@ -3162,7 +3161,7 @@ def _dispatch_change_callbacks(self, changed_paths):
                 for callback in callbacks:
                     callback(self, *callback_args)
 
-    def on_change(self, callback, *args, append=False):
+    def on_change(self, callback, append=False, *args):
         """
         Register callback function to be called when certain properties or
         subproperties of this object are modified.
@@ -3297,7 +3296,7 @@ class BaseLayoutHierarchyType(BasePlotlyType):
     """
 
     @property
-    def _parent_path_str(self) -> str:
+    def _parent_path_str(self):
         pass
 
     def __init__(self, plotly_name, **kwargs):
@@ -3603,7 +3602,7 @@ def __init__(self, plotly_name, **kwargs):
     # ---
     # All trace types must have a top-level UID
     @property
-    def uid(self) -> str:
+    def uid(self):
         raise NotImplementedError
 
     @uid.setter
@@ -3613,9 +3612,9 @@ def uid(self, val):
     # Hover
     # -----
     def on_hover(self,
-                 callback: typ.Callable[
-                     ['BaseTraceType', Points, InputDeviceState], None],
+                 callback,
                  append=False):
+        # typ.Callable[['BaseTraceType', Points, InputDeviceState], None]
         """
         Register function to be called when the user hovers over one or more
         points in this trace
@@ -3650,7 +3649,7 @@ def on_hover(self,
         if callback:
             self._hover_callbacks.append(callback)
 
-    def _dispatch_on_hover(self, points: Points, state: InputDeviceState):
+    def _dispatch_on_hover(self, points, state):
         """
         Dispatch points and device state all all hover callbacks
         """
@@ -3660,8 +3659,7 @@ def _dispatch_on_hover(self, points: Points, state: InputDeviceState):
     # Unhover
     # -------
     def on_unhover(self,
-                   callback: typ.Callable[
-                       ['BaseTraceType', Points, InputDeviceState], None],
+                   callback,
                    append=False):
         """
         Register function to be called when the user unhovers away from one
@@ -3697,7 +3695,7 @@ def on_unhover(self,
         if callback:
             self._unhover_callbacks.append(callback)
 
-    def _dispatch_on_unhover(self, points: Points, state: InputDeviceState):
+    def _dispatch_on_unhover(self, points, state):
         """
         Dispatch points and device state all all hover callbacks
         """
@@ -3707,8 +3705,7 @@ def _dispatch_on_unhover(self, points: Points, state: InputDeviceState):
     # Click
     # -----
     def on_click(self,
-                 callback: typ.Callable[
-                     ['BaseTraceType', Points, InputDeviceState], None],
+                 callback,
                  append=False):
         """
         Register function to be called when the user clicks on one or more
@@ -3743,7 +3740,7 @@ def on_click(self,
         if callback:
             self._click_callbacks.append(callback)
 
-    def _dispatch_on_click(self, points: Points, state: InputDeviceState):
+    def _dispatch_on_click(self, points, state):
         """
         Dispatch points and device state all all hover callbacks
         """
@@ -3754,9 +3751,7 @@ def _dispatch_on_click(self, points: Points, state: InputDeviceState):
     # ------
     def on_selection(
             self,
-            callback: typ.Callable[[
-                'BaseTraceType', Points, typ.Union[BoxSelector, LassoSelector]
-            ], None],
+            callback,
             append=False):
         """
         Register function to be called when the user selects one or more
@@ -3793,8 +3788,8 @@ def on_selection(
             self._select_callbacks.append(callback)
 
     def _dispatch_on_selection(self,
-                               points: Points,
-                               selector: typ.Union[BoxSelector, LassoSelector]):
+                               points,
+                               selector):
         """
         Dispatch points and selector info to selection callbacks
         """
diff --git a/plotly/basewidget.py b/plotly/basewidget.py
@@ -2,17 +2,20 @@
 from importlib import import_module
 import os
 import numbers
-from urllib import parse
+try:
+    from urllib import parse
+except ImportError:
+     from urlparse import urlparse as parse
 
 import ipywidgets as widgets
 from traitlets import List, Unicode, Dict, observe, Integer
-from plotly.basedatatypes import BaseFigure, BasePlotlyType
-from plotly.callbacks import (BoxSelector, LassoSelector,
-                              InputDeviceState, Points)
-from plotly.serializers import custom_serializers
+from .basedatatypes import BaseFigure, BasePlotlyType
+from .callbacks import (BoxSelector, LassoSelector,
+                        InputDeviceState, Points)
+from .serializers import custom_serializers
 
 
-@widgets.register
+@widgets.register()
 class BaseFigureWidget(BaseFigure, widgets.DOMWidget):
     """
     Base class for FigureWidget. The FigureWidget class is code-generated as a
diff --git a/plotly/callbacks.py b/plotly/callbacks.py
@@ -1,4 +1,4 @@
-from plotly.utils import _list_repr_elided
+from .utils import _list_repr_elided
 
 
 class InputDeviceState:
diff --git a/plotly/graph_objs/__init__.py b/plotly/graph_objs/__init__.py
@@ -65,6 +65,7 @@
 from ._frame import Frame
 from ._figure import Figure
 
+
 try:
     import ipywidgets
     from ._figurewidget import FigureWidget
diff --git a/plotly/plotly/plotly.py b/plotly/plotly/plotly.py
@@ -31,13 +31,16 @@
 from plotly.api import v1, v2
 from plotly.basedatatypes import BaseTraceType
 from plotly.plotly import chunked_requests
+
 from plotly.graph_objs import Scatter
+
 from plotly.grid_objs import Grid, Column
 from plotly.dashboard_objs import dashboard_objs as dashboard
 
 # This is imported like this for backwards compat. Careful if changing.
 from plotly.config import get_config, get_credentials
 
+
 __all__ = None
 
 DEFAULT_PLOT_OPTIONS = {
@@ -631,14 +634,16 @@ def write(self, trace, layout=None,
         validate = False
 
         # Convert trace objects to dictionaries
+        
         if isinstance(trace, BaseTraceType):
-            trace = trace.to_plotly_json()
+           trace = trace.to_plotly_json()
 
         stream_object = dict()
         stream_object.update(trace)
         if 'type' not in stream_object:
             # tests if Scatter contains invalid kwargs
-            dummy_obj = copy.deepcopy(Scatter(**stream_object))
+            # TODO: replace Scatter with something else
+            #dummy_obj = copy.deepcopy(Scatter(**stream_object))
             stream_object = Scatter(**stream_object)
             stream_object['type'] = 'scatter'
 
diff --git a/plotly/serializers.py b/plotly/serializers.py
@@ -1,5 +1,5 @@
-from plotly.basedatatypes import Undefined
-from plotly.optional_imports import get_module
+from .basedatatypes import Undefined
+from .optional_imports import get_module
 np = get_module('numpy')
 
 def _py_to_js(v, widget_manager):

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from plotly.utils import _list_repr_elided`
	`1`	`+from .utils import _list_repr_elided`
`2`	`2`
`3`	`3`
`4`	`4`	`class InputDeviceState:`