Encode all not None values.

master/bt5/slapos_cloud/DocumentTemplateItem/SoftwareInstance.py

@@ -61,9 +61,11 @@ class SoftwareInstance(Item):
       key = element.get('id').encode("UTF-8")
       value = result_dict.get(key, None)
       if value is not None:
-        value = (value + ' ' + element.text).encode("UTF-8")
+        value = (value + ' ' + element.text)
       else:
         value = element.text
+      if value is not None:
+        value = value.encode("UTF-8")
       result_dict[key] = value
     return result_dict
 

master/bt5/slapos_cloud/bt/revision

-288
+289
\ No newline at end of file