cleanup and changelog

CHANGES.rst

@@ -15,6 +15,9 @@ New:
 
 Fixes:
 
+- Skip the tests ``test_portalTypeToSchemaName_looks_up_portal_for_prefix`` and ``test_getAdditionalSchemata`` with isolation problems in Zope 4.
+  [pbauer]
+
 - make utils/datify work with newer DateTime and pytz. Adjust tests to reflect
   changes.
   [jensens]

plone/dexterity/tests/test_schema.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from Products.CMFCore.interfaces import ISiteRoot
 from pkg_resources import get_distribution
 from plone.dexterity import schema
 from plone.dexterity.fti import DexterityFTI
@@ -10,12 +9,14 @@
 from plone.dexterity.schema import SCHEMA_CACHE
 from plone.mocktestcase import MockTestCase
 from plone.supermodel.model import Model
+from Products.CMFCore.interfaces import ISiteRoot
 from zope.interface import Interface
 from zope.interface.interface import InterfaceClass
 
 import unittest
 import zope.schema
 
+
 has_zope4 = get_distribution('Zope2').version.startswith('4')
 
 

plone/dexterity/tests/test_utils.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
+from pkg_resources import get_distribution
 from plone.dexterity import utils
 from plone.dexterity.fti import DexterityFTI
 from plone.mocktestcase import MockTestCase
-from pkg_resources import get_distribution
 
 import unittest
 
+
 has_zope4 = get_distribution('Zope2').version.startswith('4')
 
 
@@ -50,16 +51,11 @@ class IBehaviorSchema(Interface):
         self.mock_utility(behavior_mock, IBehavior, behavior_name)
         self.mock_utility(fti_mock, IDexterityFTI, portal_type)
 
-        import zope.interface.registry
-        orig_getName = zope.interface.registry._getName
-        zope.interface._getName = lambda component: u''
         self.mock_adapter(
             provider_mock,
             IFormFieldProvider,
             (providedBy(IBehaviorInterface), )
         )
-        #zope.interface._getName = orig_getName
-
 
         self.replay()