Merge pull request #140 from plone/138-fixed-part1

Use mock from unittest on Python 3

news/138.bugfix

@@ -0,0 +1 @@
+Use mock from unittest on Python 3 [ale-rt]

plone/dexterity/tests/case.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from mock import Mock
-
 import gc
 import pkg_resources
 import six
@@ -15,6 +13,11 @@
 except pkg_resources.DistributionNotFound:
     HAS_ZSERVER = False
 
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
+
 
 class MockTestCase(unittest.TestCase):
     """Base class for tests using mocks.

plone/dexterity/tests/test_content.py

@@ -3,7 +3,6 @@
 from datetime import date
 from datetime import datetime
 from DateTime import DateTime
-from mock import Mock
 from plone.autoform.interfaces import IFormFieldProvider
 from plone.behavior.interfaces import IBehavior
 from plone.behavior.interfaces import IBehaviorAssignable
@@ -30,6 +29,17 @@
 import zope.schema
 
 
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
+
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
+
+
 class TestContent(MockTestCase):
 
     def setUp(self):
@@ -600,12 +610,10 @@ def test_name_unicode_id_str(self):
 
     def test_item_dublincore(self):
         from DateTime import DateTime
-        # Mock Zope DateTime
-        import mock
+
         import plone.dexterity
-        datetime_patcher = mock.patch.object(
-            plone.dexterity.content, 'DateTime'
-        )
+
+        datetime_patcher = patch.object(plone.dexterity.content, 'DateTime')
         mocked_datetime = datetime_patcher.start()
         mocked_datetime.return_value = DateTime(2014, 6, 1)
         self.addCleanup(datetime_patcher.stop)
@@ -661,12 +669,9 @@ def test_item_dublincore(self):
 
     def test_item_dublincore_date(self):
         from DateTime import DateTime
-        # Mock Zope DateTime
-        import mock
+
         import plone.dexterity
-        datetime_patcher = mock.patch.object(
-            plone.dexterity.content, 'DateTime'
-        )
+        datetime_patcher = patch.object(plone.dexterity.content, 'DateTime')
         mocked_datetime = datetime_patcher.start()
         mocked_datetime.return_value = DateTime(2014, 6, 1)
         self.addCleanup(datetime_patcher.stop)
@@ -707,12 +712,9 @@ def test_item_dublincore_date(self):
 
     def test_item_dublincore_datetime(self):
         from DateTime import DateTime
-        # Mock Zope DateTime
-        import mock
+
         import plone.dexterity
-        datetime_patcher = mock.patch.object(
-            plone.dexterity.content, 'DateTime'
-        )
+        datetime_patcher = patch.object(plone.dexterity.content, 'DateTime')
         mocked_datetime = datetime_patcher.start()
         mocked_datetime.return_value = DateTime(2014, 6, 1)
         self.addCleanup(datetime_patcher.stop)

plone/dexterity/tests/test_factory.py

@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 from .case import MockTestCase
-from mock import Mock
 from plone.dexterity.factory import DexterityFactory
 from plone.dexterity.fti import DexterityFTI
 from plone.dexterity.interfaces import IDexterityFTI
 from zope.interface import Interface
 
-import unittest
 
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
 
 class IDummy(Interface):
     pass

plone/dexterity/tests/test_fti.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from .case import MockTestCase
-from mock import Mock
 from plone.dexterity import utils
 from plone.dexterity.schema import portalTypeToSchemaName
 from plone.dexterity.factory import DexterityFactory
@@ -34,6 +33,12 @@
 import zope.schema
 
 
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
+
+
 class TestClass(object):
     meta_type = "Test Class"
 

plone/dexterity/tests/test_primary.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from .case import MockTestCase
-from mock import Mock
 from plone.dexterity.content import Item
 from plone.dexterity.fti import DexterityFTI
 from plone.dexterity.interfaces import IDexterityFTI
@@ -11,6 +10,11 @@
 from zope.interface import Interface
 
 
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
+
 class PrimaryFieldInfoTestCase(MockTestCase):
     def test_primary_field_info(self):
 

plone/dexterity/tests/test_schema.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from .case import MockTestCase
-from mock import Mock
 from plone.dexterity import schema
 from plone.dexterity.fti import DexterityFTI
 from plone.dexterity.interfaces import IContentType
@@ -16,6 +15,11 @@
 import zope.schema
 
 
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
+
 class TestSchemaModuleFactory(MockTestCase):
 
     def test_transient_schema(self):

plone/dexterity/tests/test_schema_cache.py

@@ -1,14 +1,20 @@
 # -*- coding: utf-8 -*-
 from .case import MockTestCase
-from mock import Mock
-from mock import patch
 from plone.dexterity.fti import DexterityFTI
 from plone.dexterity.interfaces import IDexterityFTI
 from plone.dexterity.schema import SCHEMA_CACHE
 from zope.interface import Interface
 
-import unittest
-import warnings
+
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
+
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
 
 
 class TestSchemaCache(MockTestCase):
@@ -66,16 +72,15 @@ def test_unexistent_behaviors_lookup(self):
         fti.behaviors = ["foo.bar"]
 
         with patch("warnings.warn") as mock_warnings:
-            warning_list = [call[1][0] for call in mock_warnings.mock_calls]
             SCHEMA_CACHE.behavior_registrations(u'testtype')
             # Verify the warning has been issued
-            self.assertEqual(
-                mock_warnings.mock_calls[-1].args[0],
+            mock_warnings.assert_called_once_with(
                 (
                     'No behavior registration found for behavior named '
                     '"foo.bar" for factory "testtype" - trying deprecated '
                     'fallback lookup (will be removed in 3.0)..."'
-                )
+                ),
+                DeprecationWarning,
             )
 
     def test_repeated_subtypes_lookup(self):

plone/dexterity/tests/test_security.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from .case import MockTestCase
-from mock import Mock
 from plone.autoform.interfaces import READ_PERMISSIONS_KEY
 from plone.dexterity.content import Container
 from plone.dexterity.content import Item
@@ -15,6 +14,10 @@
 import zope.schema
 
 
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
 class TestAttributeProtection(MockTestCase):
 
     def setUp(self):

plone/dexterity/tests/test_utils.py

@@ -1,10 +1,15 @@
 # -*- coding: utf-8 -*-
 from .case import MockTestCase
-from mock import Mock
 from plone.dexterity import utils
 from plone.dexterity.fti import DexterityFTI
 
 
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
+
+
 class TestUtils(MockTestCase):
 
     def test_getAdditionalSchemata(self):

plone/dexterity/tests/test_views.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 from .case import MockTestCase
 from AccessControl import Unauthorized
-from mock import Mock
 from plone.autoform.interfaces import IFormFieldProvider
 from plone.behavior.interfaces import IBehaviorAssignable
 from plone.dexterity.browser.add import DefaultAddForm
@@ -41,6 +40,12 @@
 import six
 
 
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
+
+
 class TestRequest(TestRequestBase):
     """Zope 3's TestRequest doesn't support item assignment, but Zope 2's
     request does.

setup.py

@@ -92,7 +92,7 @@ def read(filename):
         'test': [
             'plone.testing',
             'Products.CMFPlone',
-            'mock',
+            "mock;python_version<'3'"
         ]
     },
     entry_points="""