Do not require mock on Python2.7

Fixes #198

news/198.bugfix

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

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

setup.py

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