- unit tests passing

zopefoundation · Jan 29, 2020 · 43515a7 · 43515a7
1 parent 755d065
commit 43515a7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 640 deletions.
diff --git a/src/OFS/Image.py b/src/OFS/Image.py
@@ -648,6 +648,8 @@ def PUT(self, REQUEST, RESPONSE):
         file = REQUEST['BODYFILE']
 
         data, size = self._read_data(file)
+        if isinstance(data, str):
+            data = data.encode('UTF-8')
         content_type = self._get_content_type(file, data, self.__name__,
                                               type or self.content_type)
         self.update_data(data, content_type, size)

diff --git a/src/OFS/tests/testFileAndImage.py b/src/OFS/tests/testFileAndImage.py
@@ -256,7 +256,6 @@ def testIfModSince(self):
         self.assertEqual(data, bytes(self.file.data))
 
     def testPUT(self):
-        import pdb; pdb.set_trace()
         s = b'# some python\n'
 
         # with content type
@@ -266,7 +265,7 @@ def testPUT(self):
         self.file.PUT(req, req.RESPONSE)
 
         self.assertEqual(self.file.content_type, 'text/x-python')
-        self.assertEqual(str(self.file.data), s)
+        self.assertEqual(self.file.data, s)
 
         # without content type
         data.seek(0)
@@ -275,7 +274,7 @@ def testPUT(self):
         self.file.PUT(req, req.RESPONSE)
 
         self.assertEqual(self.file.content_type, 'text/x-python')
-        self.assertEqual(str(self.file.data), s)
+        self.assertEqual(self.file.data, s)
 
     def testIndexHtmlWithPdata(self):
         self.file.manage_upload(b'a' * (2 << 16))  # 128K

diff --git a/src/webdav/NullResource.py b/src/webdav/NullResource.py
@@ -154,7 +154,7 @@ def PUT(self, REQUEST, RESPONSE):
             body = file.read(LARGE_FILE_THRESHOLD)
             file.seek(0)
         else:
-            body = REQUEST.get('BODY', '')
+            body = REQUEST.get('BODY', b'')
 
         typ = REQUEST.get_header('content-type', None)
         if typ is None:

diff --git a/src/webdav/PropertySheet.py b/src/webdav/PropertySheet.py
@@ -22,7 +22,7 @@ def xml_escape(value):
     if not isinstance(value, str):
         value = value.decode('utf-8')
     value = escape(value)
-    return value.encode('utf-8')
+    return value
 
 
 class DAVPropertySheetMixin(object):