organize the rest of our imports.

theengineear · theengineear · commit 2e4a74d43af2 · 2015-07-07T20:31:50.000+07:00
diff --git a/plotly/__init__.py b/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__
diff --git a/plotly/graph_objs/graph_objs.py b/plotly/graph_objs/graph_objs.py
@@ -24,18 +24,18 @@
 """
 from __future__ import absolute_import
 
+import copy
 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
 __all__ = None
 
 
diff --git a/plotly/graph_objs/graph_objs_tools.py b/plotly/graph_objs/graph_objs_tools.py
@@ -1,12 +1,14 @@
 from __future__ import absolute_import
-from plotly import utils
-import textwrap
+
 import json
 import os
+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
diff --git a/plotly/grid_objs/__init__.py b/plotly/grid_objs/__init__.py
@@ -3,6 +3,6 @@
 =========
 
 """
+from __future__ import absolute_import
 
-
-from . grid_objs import Grid, Column
+from plotly.grid_objs import Grid, Column
diff --git a/plotly/grid_objs/grid_objs.py b/plotly/grid_objs/grid_objs.py
@@ -7,9 +7,8 @@
 
 import json
 from collections import MutableSequence
-from plotly import exceptions
-from plotly import utils
 
+from plotly import exceptions, utils
 
 __all__ = None
 
diff --git a/plotly/matplotlylib/__init__.py b/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
diff --git a/plotly/matplotlylib/mpltools.py b/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
 
diff --git a/plotly/matplotlylib/renderer.py b/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
diff --git a/plotly/offline/offline.py b/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('/')))
diff --git a/plotly/plotly/plotly.py b/plotly/plotly/plotly.py
@@ -16,31 +16,22 @@
 """
 from __future__ import absolute_import
 
-import sys
-import warnings
+import base64
 import copy
 import json
 import os
-import six
-import base64
-import requests
-
-if sys.version[:1] == '2':
-    from urlparse import urlparse
-else:
-    from urllib.parse import urlparse
+import warnings
 
+import requests
+import six
+import six.moves
 
+from plotly import exceptions, tools, utils, version
 from plotly.plotly import chunked_requests
-from plotly import utils
-from plotly import tools
-from plotly import exceptions
-from plotly import version
 from plotly.session import (sign_in, update_session_plot_options,
                             get_session_plot_options, get_session_credentials,
                             get_session_config)
 
-
 __all__ = None
 
 DEFAULT_PLOT_OPTIONS = {
@@ -1155,7 +1146,7 @@ def parse_grid_id_args(cls, grid, grid_url):
         else:
             supplied_arg_name = supplied_arg_names.pop()
             if supplied_arg_name == 'grid_url':
-                path = urlparse(grid_url).path
+                path = six.moves.urllib.parse(grid_url).path
                 file_owner, file_id = path.replace("/~", "").split('/')[0:2]
                 return '{0}:{1}'.format(file_owner, file_id)
             else:
diff --git a/plotly/session.py b/plotly/session.py
@@ -5,10 +5,13 @@
 which user they're signed in as, and plotting defaults.
 
 """
+from __future__ import absolute_import
 
 import copy
+
 import six
-from . import exceptions
+
+from plotly import exceptions
 
 _session = {
     'credentials': {},
diff --git a/plotly/tools.py b/plotly/tools.py
@@ -9,11 +9,10 @@
 """
 from __future__ import absolute_import
 
-import os
 import os.path
 import warnings
+
 import six
-import requests
 
 from plotly import utils
 from plotly import exceptions
diff --git a/plotly/utils.py b/plotly/utils.py
@@ -5,13 +5,12 @@
 Low-level functionality NOT intended for users to EVER use.
 
 """
-
 import json
 import os.path
+import re
 import sys
 import threading
-import re
-import datetime
+
 import pytz
 
 try:
diff --git a/plotly/widgets/__init__.py b/plotly/widgets/__init__.py
@@ -1 +1,3 @@
-from . graph_widget import GraphWidget
+from __future__ import absolute_import
+
+from plotly.widgets.graph_widget import GraphWidget
diff --git a/plotly/widgets/graph_widget.py b/plotly/widgets/graph_widget.py
@@ -1,6 +1,12 @@
-from collections import deque
+"""
+Module to allow Plotly graphs to interact with IPython widgets.
+
+"""
 import json
 import uuid
+from collections import deque
+from pkg_resources import resource_string
+
 
 # TODO: protected imports?
 from IPython.html import widgets
@@ -10,8 +16,6 @@
 import plotly.plotly.plotly as py
 from plotly import utils, tools
 from plotly.graph_objs import Figure
-from pkg_resources import resource_string
-
 
 # Load JS widget code
 # No officially recommended way to do this in any other way
