read_str strips of Null bytes

Author: markreidvfx

aaf/define/DefObject.pyx

@@ -31,4 +31,4 @@ cdef class DefObject(AAFObject):
             error_check(self.defobject_ptr.GetName(buf.get_ptr(),  buf.size_in_bytes))
 
             # strip off Null Terminator
-            return buf.read_str()[:-1]
+            return buf.read_str()

aaf/define/MetaDef.pyx

@@ -30,7 +30,7 @@ cdef class MetaDef(AAFBase):
             error_check(self.meta_ptr.GetName(buf.get_ptr(),  buf.size_in_bytes))
 
             # strip off Null Terminator
-            return buf.read_str()[:-1]
+            return buf.read_str()
 
 
     property description:
@@ -44,7 +44,7 @@ cdef class MetaDef(AAFBase):
             error_check(self.meta_ptr.GetDescription(buf.get_ptr(),  buf.size_in_bytes))
 
             # strip off Null Terminator
-            return buf.read_str()[:-1]
+            return buf.read_str()
 
     property auid:
         def __get__(self):

aaf/define/TypeDefEnum.pyx

@@ -41,7 +41,7 @@ cdef class TypeDefEnum(TypeDef):
         error_check(self.ptr.GetElementName(index, buf.get_ptr(), buf.size_in_bytes))
 
         # strip off Null Terminator
-        return buf.read_str()[:-1]
+        return buf.read_str()
 
     def element_name_from_value(self, PropertyValue p_value):
         cdef lib.aafUInt32 size_in_bytes
@@ -54,7 +54,7 @@ cdef class TypeDefEnum(TypeDef):
         error_check(self.ptr.GetNameFromValue(p_value.ptr, buf.get_ptr(), buf.size_in_bytes))
 
         # strip off Null Terminator
-        return buf.read_str()[:-1]
+        return buf.read_str()
 
     def element_value(self, lib.aafUInt32 index):
         cdef lib.aafInt64 value

aaf/define/TypeDefExtEnum.pyx

@@ -35,7 +35,7 @@ cdef class TypeDefExtEnum(TypeDef):
         error_check(self.ptr.GetElementName(index, buf.get_ptr(), buf.size_in_bytes))
 
         # strip off Null Terminator
-        return buf.read_str()[:-1]
+        return buf.read_str()
 
     def element_name_from_value(self, PropertyValue p_value):
         cdef lib.aafUInt32 size_in_bytes
@@ -48,7 +48,7 @@ cdef class TypeDefExtEnum(TypeDef):
         error_check(self.ptr.GetNameFromValue(p_value.ptr, buf.get_ptr(), buf.size_in_bytes))
 
         # strip off Null Terminator
-        return buf.read_str()[:-1]
+        return buf.read_str()
 
     def element_value(self, lib.aafUInt32 index):
 

aaf/define/TypeDefRecord.pyx

@@ -106,7 +106,7 @@ cdef class TypeDefRecord(TypeDef):
         buf.size_in_bytes = size_in_bytes
         error_check(self.ptr.GetMemberName(index, buf.get_ptr(), buf.size_in_bytes))
 
-        return buf.read_str()[:-1]
+        return buf.read_str()
 
     def member_typedef(self, lib.aafUInt32 index):
         cdef TypeDef typedef = TypeDef.__new__(TypeDef)

aaf/define/TypeDefString.pyx

@@ -47,7 +47,7 @@ cdef class TypeDefString(TypeDef):
         error_check(self.ptr.GetElements(p_value.ptr, <lib.aafMemPtr_t> buf.get_ptr(), buf.size_in_bytes))
 
         # strip off Null Terminator
-        return buf.read_str()[:-1]
+        return buf.read_str()
 
     def value(self, PropertyValue p_value):
         return self.get_value(p_value)

aaf/essence/EssenceAccess.pyx

@@ -147,7 +147,7 @@ cdef class EssenceAccess(EssenceMultiAccess):
             name.size = 1024
             error_check(self.ptr.GetCodecName(name.size, name.get_ptr()))
 
-            return name.read_str().rstrip("\0")
+            return name.read_str()
 
     property codecID:
         def __get__(self):

aaf/essence/Locator.pyx

@@ -37,7 +37,7 @@ cdef class Locator(AAFObject):
             error_check(self.loc_ptr.GetPath(buf.get_ptr(),  buf.size_in_bytes))
 
             # strip off Null Terminator
-            return buf.read_str()[:-1]
+            return buf.read_str()
 
         def __set__(self, value):
             cdef AAFCharBuffer buf = AAFCharBuffer(value)

aaf/util/AAFCharBuffer.pyx

@@ -66,7 +66,7 @@ cdef class AAFCharBuffer(object):
         return self.read_unicode().encode("ascii")
 
     cpdef object read_str(self):
-        return self.read_unicode()
+        return self.read_unicode().rstrip("\0")
 
     cpdef bytes read_raw(self):
         cdef char * data = <char *> &self.buf[0]
@@ -80,7 +80,7 @@ cdef class AAFCharBuffer(object):
             return self.buf.size() * sizeof(lib.aafCharacter)
 
         def __set__(self, size_t size):
-            self.buf.resize(size / self.aafchar_size)
+            self.buf.resize( (size / self.aafchar_size) + 1)
 
     property size:
         def __get__(self):

tests/test_AAFCharBuffer.py

@@ -49,7 +49,7 @@ def test_basic(self):
 
         for text in (char_num(40960), b'cow', u'cow', char_num(255), "some text", u"\U0001F600"):
             buf = aaf.util.AAFCharBuffer(text)
-            result = buf.read_unicode()[:-1]
+            result = buf.read_str()
 
             if isinstance(text, bytes):
                 text = text.decode("ascii")