Merge pull request #199 from plone/ale-improvements

Do not break with unknown MIME types

news/197.bugfix

@@ -0,0 +1 @@
+Do not break with unknown MIME types [ale-rt]

news/198.bugfix

@@ -0,0 +1 @@
+Require mock only on Python 2.7 [ale-rt]

plone/app/content/browser/vocabulary.py

@@ -15,6 +15,7 @@
 from Products.CMFPlone.utils import safe_unicode
 from Products.Five import BrowserView
 from Products.MimetypesRegistry.MimeTypeItem import guess_icon_path
+from Products.MimetypesRegistry.MimeTypeItem import PREFIX
 from types import FunctionType
 from z3c.form.interfaces import ISubForm
 from zope.component import getUtility
@@ -250,9 +251,18 @@ def __call__(self):
                             getattr(vocab_item, 'mime_type', None))
                         if contenttype:
                             ctype = mtt.lookup(contenttype)
-                            item[key] = '/'.join([
-                                base_path,
-                                guess_icon_path(ctype[0])])
+                            if ctype:
+                                item[key] = '/'.join([
+                                    base_path,
+                                    guess_icon_path(ctype[0])])
+                            else:
+                                item[key] = "/".join(
+                                    [
+                                        base_path,
+                                        PREFIX.rstrip("/"),
+                                        "unknown.png",
+                                    ]
+                                )
                 items.append(item)
         else:
             items = [{'id': item.value,

plone/app/content/tests/test_contents.py

@@ -18,10 +18,14 @@
 from zope.component import getUtility
 
 import json
-import mock
 import transaction
 import unittest
 
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
 
 class ContentsCopyTests(unittest.TestCase):
     layer = PLONE_APP_CONTENT_DX_INTEGRATION_TESTING

plone/app/content/tests/test_widgets.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from mock import Mock
 from plone.app.content.browser import vocabulary
 from plone.app.content.browser.file import FileUploadView
 from plone.app.content.browser.query import QueryStringIndexOptions
@@ -26,7 +25,6 @@
 from zope.publisher.browser import TestRequest
 
 import json
-import mock
 import os
 import transaction
 
@@ -37,6 +35,11 @@
     def processQueue():
         pass
 
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
 
 _dir = os.path.dirname(__file__)
 
@@ -388,7 +391,7 @@ def testSource(self):
         class DummyCatalogSource(object):
             def search_catalog(self, query):
                 querytext = query['SearchableText']['query']
-                return [Mock(id=querytext)]
+                return [mock.Mock(id=querytext)]
 
         widget = TextWidget(self.request)
         widget.context = self.portal
@@ -468,7 +471,7 @@ def testSourcePermissionDenied(self):
         class DummyCatalogSource(object):
             def search_catalog(self, query):
                 querytext = query['SearchableText']['query']
-                return [Mock(id=querytext)]
+                return [mock.Mock(id=querytext)]
 
         widget = TextWidget(self.request)
         widget.context = self.portal
@@ -503,7 +506,7 @@ def testSourceTextQuery(self):
         @implementer(ISource)
         class DummyCatalogSource(object):
             def search(self, query):
-                return [Mock(value=Mock(id=query))]
+                return [mock.Mock(value=mock.Mock(id=query))]
 
         widget = TextWidget(self.request)
         widget.context = self.portal
@@ -565,6 +568,41 @@ def testUntranslatableMetadata(self):
         # portal_type is never translated
         self.assertEqual(data['results'][0]['portal_type'], u'Document')
 
+    def testGetMimeIcon(self):
+        """ Check if the returned icon is correct
+        """
+        self.request.form.update(
+            {
+                "name": "plone.app.vocabularies.Catalog",
+                "attributes": ["getMimeIcon"],
+            }
+        )
+        view = VocabularyView(self.portal, self.request)
+
+        # Check an empty file
+        self.portal.invokeFactory("File", id="my-file", title="My file")
+        obj = self.portal["my-file"]
+        obj.reindexObject()
+
+        self.assertListEqual(
+            json.loads(view())["results"], [{"getMimeIcon": None}]
+        )
+
+        # mock a pdf
+        obj.file = mock.Mock(contentType="application/pdf")
+        obj.reindexObject()
+        self.assertListEqual(
+            json.loads(view())["results"],
+            [{"getMimeIcon": "/plone/++resource++mimetype.icons/pdf.png"}],
+        )
+
+        # mock something unknown
+        obj.file = mock.Mock(contentType="x-foo/x-bar")
+        obj.reindexObject()
+        self.assertListEqual(
+            json.loads(view())["results"],
+            [{"getMimeIcon": "/plone/++resource++mimetype.icons/unknown.png"}],
+        )
 
 class FunctionalBrowserTest(unittest.TestCase):
 

setup.py

@@ -37,7 +37,7 @@
         test=[
             'plone.app.contenttypes',
             'plone.app.testing',
-            'mock'
+            'mock;python_version<"3.3"'
         ]
     ),
     install_requires=[