Fix on Python 2 by conditionally choosing between providing __bytes__…

… and __str__
plone · May 9, 2018 · 60fcd52 · 60fcd52
1 parent a641325
commit 60fcd52
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/plone/namedfile/file.py b/plone/namedfile/file.py
@@ -45,7 +45,7 @@ def __len__(self):
         data = bytes(self)
         return len(data)
 
-    def __bytes__(self):
+    def _get_contents(self):
         next = self.next
         if next is None:
             return self._data
@@ -58,6 +58,11 @@ def __bytes__(self):
 
         return b''.join(result)
 
+    if six.PY2:
+        __str__ = _get_contents
+    else:
+        __bytes__ = _get_contents
+
 
 FILECHUNK_CLASSES = [FileChunk]
 try: