Fix Python 2.7 compatibility.

plone · Mar 15, 2024 · a38d765 · a38d765
1 parent 1dd6ca4
commit a38d765
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 25 deletions.
diff --git a/plone/namedfile/field.py b/plone/namedfile/field.py
@@ -57,7 +57,7 @@ def __call__(self):
         for accept in self.field.accept:
             if accept[0] == ".":
                 # This is a file extension. Get a media type from it.
-                accept = mimetypes.guess_type(f"dummy{accept}", strict=False)[0]
+                accept = mimetypes.guess_type("dummy" + accept, strict=False)[0]
                 if accept is None:
                     # This extension is unknown. Skip it.
                     continue
@@ -98,10 +98,10 @@ def __init__(self, **kw):
             self.accept = kw.pop("accept")
         if "schema" in kw:
             self.schema = kw.pop("schema")
-        super().__init__(schema=self.schema, **kw)
+        super(NamedField, self).__init__(schema=self.schema, **kw)
 
     def validate(self, value, interface):
-        super().validate(value)
+        super(NamedField, self).validate(value)
         for name, validator in getAdapters((self, value), interface):
             validator()
 
@@ -115,7 +115,7 @@ class NamedFile(NamedField):
     accept = ()
 
     def validate(self, value):
-        super().validate(value, IPluggableFileFieldValidation)
+        super(NamedFile, self).validate(value, IPluggableFileFieldValidation)
 
 
 @implementer(INamedImageField)
@@ -127,7 +127,7 @@ class NamedImage(NamedField):
     accept = ("image/*",)
 
     def validate(self, value):
-        super().validate(value, IPluggableImageFieldValidation)
+        super(NamedImage, self).validate(value, IPluggableImageFieldValidation)
 
 
 @implementer(INamedBlobFileField)
@@ -139,7 +139,7 @@ class NamedBlobFile(NamedField):
     accept = ()
 
     def validate(self, value):
-        super().validate(value, IPluggableFileFieldValidation)
+        super(NamedBlobFile, self).validate(value, IPluggableFileFieldValidation)
 
 
 @implementer(INamedBlobImageField)
@@ -151,4 +151,4 @@ class NamedBlobImage(NamedField):
     accept = ("image/*",)
 
     def validate(self, value):
-        super().validate(value, IPluggableImageFieldValidation)
+        super(NamedBlobImage, self).validate(value, IPluggableImageFieldValidation)
diff --git a/plone/namedfile/tests/test_doctests.py b/plone/namedfile/tests/test_doctests.py
@@ -26,6 +26,7 @@ def check_output(self, want, got, optionflags):
                 "WrongType", "zope.schema._bootstrapinterfaces.WrongType", got)
             got = got.replace(
                 "filename*=\"utf-8''test.txt\"", "filename*=utf-8''test.txt")
+            got = re.sub("InvalidFile", "plone.namedfile.field.InvalidFile", got)
 
         if six.PY3:
             got = re.sub("b'(.*?)'", "'\\1'", got)

diff --git a/plone/namedfile/tests/test_utils.py b/plone/namedfile/tests/test_utils.py
@@ -21,7 +21,7 @@ def test_get_contenttype(self):
             get_contenttype(
                 NamedImage(
                     getFile("image.gif"),
-                    filename="image.gif",
+                    filename=u"image.gif",
                 )
             ),
             "image/gif",
@@ -30,7 +30,7 @@ def test_get_contenttype(self):
             get_contenttype(
                 NamedImage(
                     getFile("image.tif"),
-                    filename="image.tif",
+                    filename=u"image.tif",
                 )
             ),
             "image/tiff",
@@ -39,26 +39,26 @@ def test_get_contenttype(self):
             get_contenttype(
                 NamedImage(
                     getFile("notimage.doc"),
-                    filename="notimage.doc",
+                    filename=u"notimage.doc",
                 )
             ),
             "application/msword",
         )
 
         # Filename only detection of a non-IANA registered type.
         self.assertEqual(
-            get_contenttype(filename="image.webp"),
+            get_contenttype(filename=u"image.webp"),
             "image/webp",
         )
 
         # Filename only detection of a non-IANA registered type.
         self.assertEqual(
-            get_contenttype(filename="song.midi"),
+            get_contenttype(filename=u"song.midi"),
             "audio/midi",
         )
 
         # Detection of a surely not registered type.
         self.assertEqual(
-            get_contenttype(filename="nothing.plonenamedfile"),
+            get_contenttype(filename=u"nothing.plonenamedfile"),
             "application/octet-stream",
         )
diff --git a/plone/namedfile/tests/test_validation.py b/plone/namedfile/tests/test_validation.py
@@ -28,15 +28,15 @@ def test_validation_NamedImage_default(self):
         self.assertRaises(field.InvalidImageFile, image_field.validate, named_image)
 
         # field has an png image file, passes
-        named_image = file.NamedImage(getFile("image.png"), filename="image.png")
+        named_image = file.NamedImage(getFile("image.png"), filename=u"image.png")
         image_field.validate(named_image)
 
         # field has an gif image file, passes
-        named_image = file.NamedImage(getFile("image.gif"), filename="image.gif")
+        named_image = file.NamedImage(getFile("image.gif"), filename=u"image.gif")
         image_field.validate(named_image)
 
         # field has a non-image file, fails
-        named_image = file.NamedImage(getFile("notimage.doc"), filename="notimage.doc")
+        named_image = file.NamedImage(getFile("notimage.doc"), filename=u"notimage.doc")
         self.assertRaises(field.InvalidImageFile, image_field.validate, named_image)
 
     def test_validation_NamedImage_custom(self):
@@ -58,20 +58,20 @@ def test_validation_NamedImage_custom(self):
         self.assertRaises(field.InvalidImageFile, image_field.validate, named_image)
 
         # field has a png image file, passes
-        named_image = file.NamedImage(getFile("image.png"), filename="image.png")
+        named_image = file.NamedImage(getFile("image.png"), filename=u"image.png")
         image_field.validate(named_image)
 
         # field has a jpg image file, passes also
-        named_image = file.NamedImage(getFile("image.jpg"), filename="image.jpg")
+        named_image = file.NamedImage(getFile("image.jpg"), filename=u"image.jpg")
         image_field.validate(named_image)
 
         # field has a gif image file, fails because it's not in the accepted
         # media types
-        named_image = file.NamedImage(getFile("image.gif"), filename="image.gif")
+        named_image = file.NamedImage(getFile("image.gif"), filename=u"image.gif")
         self.assertRaises(field.InvalidImageFile, image_field.validate, named_image)
 
         # field has a non-image file, fails
-        named_image = file.NamedImage(getFile("notimage.doc"), filename="notimage.doc")
+        named_image = file.NamedImage(getFile("notimage.doc"), filename=u"notimage.doc")
         self.assertRaises(field.InvalidImageFile, image_field.validate, named_image)
 
     def test_validation_NamedFile_default(self):
@@ -84,11 +84,11 @@ def test_validation_NamedFile_default(self):
         file_field.validate(None)
 
         # field has n pdf file file, passes
-        named_file = file.NamedFile(getFile("file.pdf"), filename="file.pdf")
+        named_file = file.NamedFile(getFile("file.pdf"), filename=u"file.pdf")
         file_field.validate(named_file)
 
         # field has a gif file, passes
-        named_file = file.NamedFile(getFile("image.gif"), filename="image.gif")
+        named_file = file.NamedFile(getFile("image.gif"), filename=u"image.gif")
         file_field.validate(named_file)
 
     def test_validation_NamedFile_custom(self):
@@ -102,14 +102,14 @@ def test_validation_NamedFile_custom(self):
         file_field.validate(None)
 
         # field has a pdf file file, passes
-        named_file = file.NamedFile(getFile("file.pdf"), filename="file.pdf")
+        named_file = file.NamedFile(getFile("file.pdf"), filename=u"file.pdf")
         file_field.validate(named_file)
 
         # field has a jpg file file, passes also
-        named_file = file.NamedFile(getFile("image.jpg"), filename="image.jpg")
+        named_file = file.NamedFile(getFile("image.jpg"), filename=u"image.jpg")
         file_field.validate(named_file)
 
         # field has a gif file, fails because it's not in the accepted media
         # types
-        named_file = file.NamedFile(getFile("image.gif"), filename="image.gif")
+        named_file = file.NamedFile(getFile("image.gif"), filename=u"image.gif")
         self.assertRaises(field.InvalidFile, file_field.validate, named_file)