Fixes for Python 3.x errors

Author: freeman-lab

lightning/types/base.py

@@ -1,5 +1,6 @@
 from lightning import Visualization
 import requests
+import six
 
 
 class Base(Visualization):
@@ -105,7 +106,7 @@ def baseplot(cls, session, type, *args, **kwargs):
 
         options = {}
         if hasattr(cls, '_validOptions'):
-            for key, value in kwargs.iteritems():
+            for key, value in six.iteritems(kwargs):
                 if key in cls._validOptions:
                     lgn_option = cls._validOptions[key].get('lightning_name')
                     options[lgn_option] = value

lightning/visualization.py

@@ -1,7 +1,6 @@
 import requests
 import json
 import webbrowser
-import urllib
 
 
 class Visualization(object):
@@ -14,8 +13,11 @@ def __init__(self, session=None, json=None, auth=None):
     def _format_url(self, url):
         if not url.endswith('/'):
             url += '/'
-
-        return url + '?host=' + urllib.quote(self.session.host)
+        try:
+            from urllib.parse import quote
+        except ImportError:
+            from urllib import quote
+        return url + '?host=' + quote(self.session.host)
 
     def _update_image(self, image):
         url = self.session.host + '/sessions/' + str(self.session.id) + '/visualizations/' + str(self.id) + '/data/images'

requirements.txt

@@ -2,4 +2,5 @@ setuptools
 requests
 numpy
 pytest
-matplotlib
+matplotlib
+six