Merge pull request #45 from plone/issue_38_master

Issue 38 master
plone · Apr 25, 2017 · d7fcec3 · d7fcec3 · jenkins-plone-org · Apr 25, 2017
2 parents fe03180 + 98239b9
commit d7fcec3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -14,6 +14,9 @@ New features:
 
 Bug fixes:
 
+- Fix contentType attribute should be str type, what leads to validation errors (fixes `#38`_).
+  [rodfersou]
+
 - Fix bug on Image rotation if ImageIFD.XResolution or ImageIFD.YResolution are not set.
   [loechel]
 
@@ -461,3 +464,6 @@ Fixes:
 ------------------
 
 * Initial release
+
+
+.. _`#38`: https://github.com/plone/plone.namedfile/issues/38
diff --git a/plone/namedfile/scaling.py b/plone/namedfile/scaling.py
@@ -265,7 +265,7 @@ def __call__(
             return
 
         data, format_, dimensions = result
-        mimetype = u'image/{0}'.format(format_.lower())
+        mimetype = 'image/{0}'.format(format_.lower())
         value = orig_value.__class__(
             data,
             contentType=mimetype,

diff --git a/plone/namedfile/tests/test_scaling.py b/plone/namedfile/tests/test_scaling.py
@@ -74,6 +74,9 @@ def testCreateScale(self):
         foo = self.scaling.scale('image', width=100, height=80)
         self.assertTrue(foo.uid)
         self.assertEqual(foo.mimetype, 'image/png')
+        self.assertIsInstance(foo.mimetype, str)
+        self.assertEqual(foo.data.contentType, 'image/png')
+        self.assertIsInstance(foo.data.contentType, str)
         self.assertEqual(foo.width, 80)
         self.assertEqual(foo.height, 80)
         assertImage(self, foo.data.data, 'PNG', (80, 80))
@@ -105,6 +108,9 @@ def testGetScaleByName(self):
         foo = self.scaling.scale('image', scale='foo')
         self.assertTrue(foo.uid)
         self.assertEqual(foo.mimetype, 'image/png')
+        self.assertIsInstance(foo.mimetype, str)
+        self.assertEqual(foo.data.contentType, 'image/png')
+        self.assertIsInstance(foo.data.contentType, str)
         self.assertEqual(foo.width, 60)
         self.assertEqual(foo.height, 60)
         assertImage(self, foo.data.data, 'PNG', (60, 60))