organize the rest of our imports.

Author: theengineear

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/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
 
 

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

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

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
 

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/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: