Merge branch 'main' into fb_adding_multiple_rows

zms-publishing · Jul 13, 2023 · 3bfd221 · 3bfd221
2 parents bed421b + 19b5163
commit 3bfd221
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/Products/zms/_blobfields.py b/Products/zms/_blobfields.py
@@ -145,9 +145,6 @@ def createBlobField(self, objtype, file=b''):
     blob = uploadBlobField( self, objtype, file)
   elif isinstance(file, dict):
     data = file.get( 'data', '')
-    if isinstance(data, str):
-      data = bytes(data,'utf-8')
-      data = io.BytesIO( data)
     blob = uploadBlobField( self, objtype, data, file.get('filename', ''))
     if file.get('content_type'):
       blob.content_type = file.get('content_type')
@@ -167,6 +164,7 @@ def uploadBlobField(self, clazz, file=b'', filename=''):
   f = None
   if isinstance(file,str):
     f = re.findall(r'^data:(.*?);base64,([\s\S]*)$',file)
+    file = bytes(file,'utf-8')
   if f:
     mt = f[0][0]
     file = base64.b64decode(f[0][1])