Handle scons 3 returning str for Value objects

Some scons-3 variants return str (Unicode) while others return bytes for a Value node's get_contents() method. Handle both cases.
salilab · Jan 21, 2020 · b04af84 · b04af84
1 parent 0f8cd67
commit b04af84
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/python/saliweb/build/__init__.py b/python/saliweb/build/__init__.py
@@ -31,7 +31,11 @@
 
 if sys.version_info[0] >= 3:
     def _get_value_contents(value_node):
-        return value_node.get_contents().decode('utf-8')
+        contents = value_node.get_contents()
+        if isinstance(contents, bytes):
+            return contents.decode('utf-8')
+        else:
+            return contents
 else:
     def _get_value_contents(value_node):
         return value_node.get_contents()