make rest service py2/py3 compatible

New UI branch updates altered things slightly

Author: Madison Bahmer

rest/rest_service.py

@@ -18,6 +18,7 @@
 import logging
 import json
 import threading
+from six import string_types
 
 from kafka import KafkaConsumer, KafkaProducer
 from kafka.common import KafkaError
@@ -40,7 +41,7 @@
 
 def crossdomain(origin='*', max_age=21600, attach_to_all=True, automatic_options=True):
 
-    if not isinstance(origin, basestring):
+    if not isinstance(origin, string_types):
         origin = ', '.join(origin)
     if isinstance(max_age, timedelta):
         max_age = max_age.total_seconds()

rest/tests/test_rest_service.py

@@ -592,7 +592,7 @@ def fancy_get_time():
             data = json.loads(results.data)
             self.assertEquals(data, d)
             self.assertEquals(results.status_code, 200)
-            self.assertFalse(self.rest_service.uuids.has_key('key'))
+            self.assertFalse('key' in self.rest_service.uuids)
 
 
         # test with uuid, no response
@@ -612,7 +612,7 @@ def fancy_get_time2():
             data = json.loads(results.data)
             self.assertEquals(data, d)
             self.assertEquals(results.status_code, 200)
-            self.assertTrue(self.rest_service.uuids.has_key('key'))
+            self.assertTrue('key' in self.rest_service.uuids)
             self.assertEquals(self.rest_service.uuids['key'], 'poll')
 
     def test_poll(self):