the big merge

[nepi.git] / src / nepi / util / sfarspec_proc.py

diff --git a/src/nepi/util/sfarspec_proc.py b/src/nepi/util/sfarspec_proc.py
index f8c8bb2..b131ddc 100644 (file)
--- a/src/nepi/util/sfarspec_proc.py
+++ b/src/nepi/util/sfarspec_proc.py
@@ -24,7 +24,7 @@ except ImportError:
     log.debug("Package sfa-common not installed.\
          Could not import sfa.rspecs.rspec and sfa.util.xrn")
 
-from types import StringTypes, ListType
+from six import string_types
 
 
 class SfaRSpecProcessing(object):
@@ -37,7 +37,7 @@ class SfaRSpecProcessing(object):
         self.config = config 
 
     def make_dict_rec(self, obj):
-        if not obj or isinstance(obj, (StringTypes, bool)):
+        if not obj or isinstance(obj, (bool,) + string_types):
             return obj
         if isinstance(obj, list):
             objcopy = []