[Testbot] Plone 5.0 - Python 2.7 - Build # 2971 - Fixed! - 0 failure(s)

[jenkins at plone.org]

-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 2971 - Fixed!
-------------------------------------------------------------------------------

http://jenkins.plone.org/job/plone-5.0-python-2.7/2971/


-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------

Repository: plone.app.linkintegrity
Branch: refs/heads/master
Date: 2014-08-10T21:02:58+02:00
Author: Timo Stollenwerk (tisto) <tisto at plone.org>
Commit: https://github.com/plone/plone.app.linkintegrity/commit/1297d6cecb458f7241e47ffb2451dc3cc60513b6

Revert "Revert "Revert "Read the enable_link_integrity_checks setting from plone.app.registry."""

This reverts commit d83c23c41e90490541362d6fd9840b5a7f99774c.

Files changed:
M CHANGES.rst
M plone/app/linkintegrity/info.py
M plone/app/linkintegrity/tests/test_functional.py

diff --git a/CHANGES.rst b/CHANGES.rst
index acee2da..846763c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,10 +4,6 @@ Changelog
 2.1.0 (unreleased)
 ------------------
 
-- Read the enable_link_integrity_checks setting from plone.app.registry
-  instead of from the portal_properties.
-  [timo]
-
 - Restructure package to fully support dexterity framework. Use two different
   test layers in ``plone.app.testing``, migrate all doctests into real
   TestCases.
diff --git a/plone/app/linkintegrity/info.py b/plone/app/linkintegrity/info.py
index f48423d..610cfc1 100644
--- a/plone/app/linkintegrity/info.py
+++ b/plone/app/linkintegrity/info.py
@@ -3,8 +3,6 @@
 from zope.component import queryUtility
 from Acquisition import aq_base
 from Products.CMFCore.interfaces import IPropertiesTool
-from zope.component import getUtility
-from plone.registry.interfaces import IRegistry
 
 try:
     from plone.uuid.interfaces import IUUID
@@ -16,11 +14,6 @@ def IUUID(obj, default=None):
             return obj.UID()
         else:
             return default
-try:
-    from Products.CMFPlone.interfaces import IEditingSchema
-    IS_PLONE5 = True
-except ImportError:
-    IS_PLONE5 = False
 
 
 class LinkIntegrityInfo(object):
@@ -35,20 +28,12 @@ def __init__(self, context):
 
     def integrityCheckingEnabled(self):
         """ determine if link integrity checking for the site is enabled """
-        # Plone 5 uses p.a.registry to store the enable_link_integrity setting.
-        if IS_PLONE5:
-            registry = getUtility(IRegistry)
-            settings = registry.forInterface(IEditingSchema, prefix='plone')
-            return settings.enable_link_integrity_checks
-        # Plone version < 5 store the enable_link_integrity setting in the
-        # site_properties.
         ptool = queryUtility(IPropertiesTool)
         enabled = False
         if ptool is not None:
             props = getattr(ptool, 'site_properties', None)
             if props is not None:
-                enabled = props.getProperty(
-                    'enable_link_integrity_checks', False)
+                enabled = props.getProperty('enable_link_integrity_checks', False)
         return enabled
 
     def getIntegrityInfo(self):
diff --git a/plone/app/linkintegrity/tests/test_functional.py b/plone/app/linkintegrity/tests/test_functional.py
index caa5903..f604db7 100644
--- a/plone/app/linkintegrity/tests/test_functional.py
+++ b/plone/app/linkintegrity/tests/test_functional.py
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 from ZPublisher.Publish import Retry
 from Products.Archetypes.interfaces import IReferenceable
-from Products.CMFPlone.interfaces import IEditingSchema
-
 from plone.app.linkintegrity import testing
 from plone.app.linkintegrity import exceptions
 from plone.app.linkintegrity.tests.base import ATBaseTestCase
@@ -10,9 +8,6 @@
 from plone.app.testing import TEST_USER_NAME
 from plone.app.testing import TEST_USER_PASSWORD
 from plone.testing.z2 import Browser
-from plone.registry.interfaces import IRegistry
-from zope.component import getUtility
-
 
 import transaction
 import unittest
@@ -264,9 +259,8 @@ def test_linkintegrity_on_of_switch(self):
 
         # Now we turn the switch for link integrity checking off via the site
         # properties and try again:
-        registry = getUtility(IRegistry)
-        settings = registry.forInterface(IEditingSchema, prefix='plone')
-        settings.enable_link_integrity_checks = False
+        props = self.portal.portal_properties.site_properties
+        props.manage_changeProperties(enable_link_integrity_checks=False)
         transaction.commit()
         self.browser.reload()
         self.assertEqual(self.browser.url, self.portal.absolute_url())




-------------------------------------------------------------------------------