Merge pull request #8 from plone/roto-fix-py3-payload-parsing

Improved payload parsing for Py2 / Py3
plone · May 13, 2019 · d91e29c · d91e29c
2 parents 528ceaf + 232910a
commit d91e29c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/news/7.bugfix b/news/7.bugfix
@@ -0,0 +1,2 @@
+- Use a better type check in the payload parser.
+  [Rotonen]
diff --git a/plone/rfc822/_utils.py b/plone/rfc822/_utils.py
@@ -246,7 +246,7 @@ def initializeObject(context, fields, message, defaultCharset="utf-8"):
         return
 
     # A single payload is a string, multiparts are lists
-    if isinstance(payloads, str):
+    if isinstance(payloads, six.string_types):
         if len(primary) != 1:
             raise ValueError(
                 "Got a single string payload for message, but no primary "
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Use a better type check in the payload parser.
		[Rotonen]