add the changes from running 2to3

theengineear · theengineear · commit cc66004b60f8 · 2014-07-16T20:48:32.000-07:00
diff --git a/plotly/__init__.py b/plotly/__init__.py
@@ -26,8 +26,4 @@
 
 """
 
-from . version import __version__
-import graph_objs
-import plotly
-import tools
-import utils
+from plotly import plotly, graph_objs, tools, utils
diff --git a/plotly/graph_objs/__init__.py b/plotly/graph_objs/__init__.py
@@ -7,7 +7,7 @@
 
 
 """
-from graph_objs import *
+from .plotly.graph_objs.graph_objs import *
 
 __all__ = ["Data",
            "Annotations",
diff --git a/plotly/graph_objs/graph_objs.py b/plotly/graph_objs/graph_objs.py
@@ -26,8 +26,10 @@
 import collections
 import json
 import textwrap
+
 from .. import exceptions
-from .. import utils
+from plotly import utils
+
 
 __all__ = ["Data",
            "Annotations",
@@ -268,7 +270,7 @@ def __new__(mcs, name, bases, attrs):
         return super(DictMeta, mcs).__new__(mcs, name, bases, attrs)
 
 
-class PlotlyList(list):
+class PlotlyList(list, metaclass=ListMeta):
     """A container for PlotlyDicts, inherits from standard list.
 
     Plotly uses lists and dicts as collections to hold information about a
@@ -287,7 +289,6 @@ class PlotlyList(list):
 
 
     """
-    __metaclass__ = ListMeta
 
     def __init__(self, *args):
         super(PlotlyList, self).__init__(*args)
@@ -493,7 +494,7 @@ def force_clean(self, caller=True):
             del_ct += 1
 
 
-class PlotlyDict(dict):
+class PlotlyDict(dict, metaclass=DictMeta):
     """A base dict class for all objects that style a figure in plotly.
 
     A PlotlyDict can be instantiated like any dict object. This class
@@ -506,7 +507,6 @@ class PlotlyDict(dict):
     Any available methods that hold for a dict hold for a PlotlyDict.
 
     """
-    __metaclass__ = DictMeta
 
     def __init__(self, *args, **kwargs):
         class_name = self.__class__.__name__
@@ -552,7 +552,7 @@ def update(self, dict1=None, **dict2):
         self.to_graph_objs()
 
         if dict1 is not None:
-            for key, val in dict1.items():
+            for key, val in list(dict1.items()):
                 if key in self:
                     if isinstance(self[key], (PlotlyDict, PlotlyList)):
                         self[key].update(val)
@@ -562,7 +562,7 @@ def update(self, dict1=None, **dict2):
                     self[key] = val
 
         if len(dict2):
-            for key, val in dict2.items():
+            for key, val in list(dict2.items()):
                 if key in self:
                     if isinstance(self[key], (PlotlyDict, PlotlyList)):
                         self[key].update(val)
@@ -592,7 +592,7 @@ def strip_style(self):
         """
         self.to_graph_objs()
         obj_key = NAME_TO_KEY[self.__class__.__name__]
-        keys = self.keys()
+        keys = list(self.keys())
         for key in keys:
             if isinstance(self[key], (PlotlyDict, PlotlyList)):
                 self[key].strip_style()
@@ -611,7 +611,7 @@ def get_data(self):
         class_name = self.__class__.__name__
         obj_key = NAME_TO_KEY[class_name]
         d = dict()
-        for key, val in self.items():
+        for key, val in list(self.items()):
             if isinstance(val, (PlotlyDict, PlotlyList)):
                 d[key] = val.get_data()
             else:
@@ -620,13 +620,13 @@ def get_data(self):
                         d[key] = val
                 except KeyError:
                     pass
-        keys = d.keys()
+        keys = list(d.keys())
         for key in keys:
             if isinstance(d[key], (dict, list)):
                 if len(d[key]) == 0:
                     del d[key]
         if len(d) == 1:
-            d = d.values()[0]
+            d = list(d.values())[0]
         return d
 
     def to_graph_objs(self, caller=True):
@@ -639,7 +639,7 @@ def to_graph_objs(self, caller=True):
 
         """
         info_key = NAME_TO_KEY[self.__class__.__name__]
-        keys = self.keys()
+        keys = list(self.keys())
         for key in keys:
             if isinstance(self[key], (PlotlyDict, PlotlyList)):
                 try:
@@ -665,7 +665,7 @@ def to_graph_objs(self, caller=True):
                                 val_types=val_types,
                                 notes="value needs to be dictionary-like"
                             )
-                        for k, v in self.pop(key).items():
+                        for k, v in list(self.pop(key).items()):
                             obj[k] = v  # finish up momentarily...
                     else:  # if not PlotlyDict, it MUST be a PlotlyList
                         if not isinstance(self[key], list):
@@ -708,7 +708,7 @@ def validate(self, caller=True):  # TODO: validate values too?
                 err.prepare()
                 raise
         obj_key = NAME_TO_KEY[self.__class__.__name__]
-        for key, val in self.items():
+        for key, val in list(self.items()):
             if isinstance(val, (PlotlyDict, PlotlyList)):
                 try:
                     val.validate(caller=False)
@@ -843,7 +843,7 @@ def force_clean(self, caller=True):
         del_keys = [key for key in self if str(key) not in INFO[obj_key]]
         for key in del_keys:
             del self[key]
-        keys = self.keys()
+        keys = list(self.keys())
         for key in keys:
             try:
                 self[key].force_clean(caller=False)  # TODO: add error handling
@@ -889,7 +889,7 @@ def to_graph_objs(self, caller=True):  # TODO TODO TODO! check logic!
                         index=index
                     )
                 obj = NAME_TO_CLASS[obj_name]()  # don't hide if KeyError!
-                for k, v in entry.items():
+                for k, v in list(entry.items()):
                     obj[k] = v
                 self[index] = obj
             if not isinstance(self[index], PlotlyTrace):  # Trace ONLY!!!
@@ -939,7 +939,7 @@ def to_graph_objs(self, caller=True):
                     )
             elif isinstance(entry, dict):
                 obj = Annotation()
-                for k, v in entry.items():
+                for k, v in list(entry.items()):
                     obj[k] = v
                 self[index] = obj
             else:
@@ -1253,7 +1253,7 @@ def to_graph_objs(self, caller=True):
         appropriate `kind`.
 
         """
-        keys = self.keys()
+        keys = list(self.keys())
         for key in keys:
             if key[:5] in ['xaxis', 'yaxis']:  # allows appended integers!
                 try:
@@ -1267,7 +1267,7 @@ def to_graph_objs(self, caller=True):
                         obj = XAxis()
                     else:
                         obj = YAxis()
-                    for k, v in self.pop(key).items():
+                    for k, v in list(self.pop(key).items()):
                         obj[k] = v
                     self[key] = obj  # call to super will call 'to_graph_objs'
         super(Layout, self).to_graph_objs(caller=caller)
@@ -1366,7 +1366,7 @@ def force_clean(self, caller=True):  # TODO: can't make call to super...
                     del self[key]
             else:
                 del self[key]
-        keys = self.keys()
+        keys = list(self.keys())
         for key in keys:
             try:
                 self[key].force_clean(caller=False)  # TODO error handling??
diff --git a/plotly/matplotlylib/__init__.py b/plotly/matplotlylib/__init__.py
@@ -9,5 +9,3 @@
 'tools' module or 'plotly' package.
 
 """
-from . renderer import PlotlyRenderer
-from . mplexporter import Exporter
diff --git a/plotly/matplotlylib/renderer.py b/plotly/matplotlylib/renderer.py
@@ -7,9 +7,12 @@
 
 """
 import warnings
-from . mplexporter import Exporter, Renderer
+
+from . mplexporter import Renderer
 from . import mpltools
-from .. graph_objs import *
+from ..plotly.graph_objs import *
+
+
 
 # Warning format
 def warning_on_one_line(message, category, filename, lineno, file=None, line=None):
diff --git a/plotly/plotly/__init__.py b/plotly/plotly/__init__.py
@@ -7,7 +7,7 @@
 verifiable account (username/api-key pair) and a network connection.
 
 """
-from plotly import *
+from .plotly.plotly.plotly import *
 
 __all__ = ["sign_in", "update_plot_options", "get_plot_options",
            "get_credentials", "iplot", "plot", "iplot_mpl", "plot_mpl",
diff --git a/plotly/plotly/plotly.py b/plotly/plotly/plotly.py
@@ -14,16 +14,19 @@
 4. update plot_options with kwargs!
 
 """
-import requests
-import chunked_requests
 import json
 import warnings
 import copy
 import os
+
+import requests
+
+from . import chunked_requests
 from .. import utils  # TODO make non-relative
 from .. import tools
 from .. import exceptions
-from .. import version
+from plotly import version
+
 
 __all__ = ["sign_in", "update_plot_options", "get_plot_options",
            "get_credentials", "iplot", "plot", "iplot_mpl", "plot_mpl",
@@ -160,7 +163,7 @@ def plot(figure_or_data, validate=True, **plot_options):
                                          "plot option.\nHere's why you're "
                                          "seeing this error:\n\n{}".format(err))
     for entry in figure['data']:
-        for key, val in entry.items():
+        for key, val in list(entry.items()):
             try:
                 if len(val) > 40000:
                     msg = ("Woah there! Look at all those points! Due to "
@@ -658,11 +661,11 @@ def _send_to_plotly(figure, **plot_options):
     r.raise_for_status()
     r = json.loads(r.text)
     if 'error' in r and r['error'] != '':
-        print(r['error'])
+        print((r['error']))
     if 'warning' in r and r['warning'] != '':
         warnings.warn(r['warning'])
     if 'message' in r and r['message'] != '':
-        print(r['message'])
+        print((r['message']))
 
     return r
 
diff --git a/plotly/tools.py b/plotly/tools.py
diff --git a/plotly/utils.py b/plotly/utils.py
