X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=blobdiff_plain;f=src%2Fnepi%2Futil%2Fsfarspec_proc.py;h=b131ddc3761d7025b153f195062be0a15848fc78;hp=f8c8bb2fb78cf6d4c738629054a36d120a0cc9c7;hb=3fe2e6f7812888dc1366915545dd2243ff6fb1bb;hpb=40abd97d4963775e6ec31b2b2ea80d2fd0642b7e diff --git a/src/nepi/util/sfarspec_proc.py b/src/nepi/util/sfarspec_proc.py index f8c8bb2f..b131ddc3 100644 --- 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 = []