type str fixes

adagios/objectbrowser/forms.py

@@ -169,7 +169,7 @@ def prepare_value(self, value):
         """
         if value is None:
             return []
-        if isinstance(u'value', str):
+        if isinstance(value, basestring):
             self.attributelist = AttributeList(value)
             self.__prefix = self.attributelist.operator
             return self.attributelist.fields

adagios/rest/tests.py

@@ -21,7 +21,8 @@
 
 Replace these with more appropriate tests for your application.
 """
-
+#from __future__ import unicode_literals
+from builtins import str
 from django.test import TestCase
 from django.test.client import Client
 from django.utils.translation import ugettext as _

adagios/status/rest.py

@@ -23,9 +23,10 @@
 """
 from __future__ import division
 from __future__ import print_function
+#from __future__ import unicode_literals
 
 from past.builtins import cmp
-from builtins import str
+from builtins import str, int
 from past.utils import old_div
 import time
 import pynag.Control.Command

adagios/status/utils.py

@@ -21,7 +21,9 @@
 # adagios.status.views
 
 from __future__ import division
+#from __future__ import unicode_literals
 from past.builtins import cmp
+from past.builtins import basestring
 from builtins import str
 from past.utils import old_div
 import pynag.Utils
@@ -292,7 +294,10 @@ def get_hosts(request, fields=None, *args, **kwargs):
         fields = _DEFAULT_HOST_COLUMNS
 
     # fields should be a list, lets create a Column: query for livestatus
-    if isinstance(fields, str):
+#    if isinstance(fields, str):
+#        fields = fields.split(',')
+
+    if isinstance(fields, basestring):
         fields = fields.split(',')
 
     query.set_columns(*fields)