adjust imports to not cater to python 2.6!

Author: theengineear

plotly/exceptions.py

@@ -15,13 +15,7 @@
 
 
 """
-import sys
-import six
-
-if sys.version[:3] == '2.6':
-    import simplejson as json
-else:
-    import json
+import json
 
 ## Base Plotly Error ##
 

plotly/graph_objs/graph_objs.py

@@ -25,6 +25,7 @@
 from __future__ import absolute_import
 
 import warnings
+from collections import OrderedDict
 import six
 from plotly.graph_objs import graph_objs_tools
 from plotly.graph_objs.graph_objs_tools import (
@@ -35,12 +36,6 @@
 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,22 +1,9 @@
 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
+from collections import OrderedDict
 import six
 
 from pkg_resources import resource_string

plotly/grid_objs/grid_objs.py

@@ -5,15 +5,11 @@
 """
 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
 
 __all__ = None
 

plotly/plotly/plotly.py

@@ -19,6 +19,7 @@
 import sys
 import warnings
 import copy
+import json
 import os
 import six
 import base64
@@ -29,10 +30,6 @@
 else:
     from urllib.parse import urlparse
 
-if sys.version[:3] == '2.6':
-    import simplejson as json
-else:
-    import json
 
 from plotly.plotly import chunked_requests
 from plotly import utils

plotly/utils.py

@@ -6,6 +6,7 @@
 
 """
 
+import json
 import os.path
 import sys
 import threading
@@ -31,11 +32,6 @@
 except ImportError:
     _sage_imported = False
 
-if sys.version[:3] == '2.6':
-    import simplejson as json
-else:
-    import json
-
 
 ### incase people are using threading, we lock file reads
 lock = threading.Lock()

plotly/widgets/graph_widget.py

@@ -1,6 +1,6 @@
 from collections import deque
+import json
 import uuid
-import sys
 
 # TODO: protected imports?
 from IPython.html import widgets
@@ -12,11 +12,6 @@
 from plotly.graph_objs import Figure
 from pkg_resources import resource_string
 
-# even though python 2.6 wouldn't be able to run *any* of this...
-if sys.version[:3] == '2.6':
-    import simplejson as json
-else:
-    import json
 
 # Load JS widget code
 # No officially recommended way to do this in any other way