Add unicode support to BaseProperty

Author: gtback

cybox/common/properties.py

@@ -36,7 +36,11 @@ def __init__(self, value=None):
         self.refanging_transform = None
 
     def __str__(self):
-        return str(self.serialized_value)
+        # To be safe, return the unicode string encoded as UTF-8
+        return self.__unicode__().encode("utf-8")
+
+    def __unicode__(self):
+        return unicode(self.serialized_value)
 
     def __int__(self):
         return int(self.serialized_value)

cybox/test/common/properties_test.py

@@ -30,6 +30,12 @@ def test_integer(self):
         self.assertTrue(i.datatype, "Integer")
         self.assertTrue(i.value, 42)
 
+    def test_unicode_string(self):
+        s = u"A Unicode \ufffd string"
+        string = String(s)
+        self.assertEqual(s, unicode(string))
+        self.assertEqual(s.encode("utf-8"), str(string))
+
     def test_cannot_create_abstract_obj(self):
         a = BaseProperty()
         self.assertRaises(NotImplementedError, a.to_obj)