[Testbot] Plone 5.0 - Python 2.7 - Build # 1714 - Regression! - 7 failure(s)
jenkins at plone.org
jenkins at plone.org
Sun Feb 23 08:42:42 UTC 2014
-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 1714 - Failure!
-------------------------------------------------------------------------------
http://jenkins.plone.org/job/plone-5.0-python-2.7/1714/
-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------
Repository: plone.app.layout
Branch: refs/heads/master
Date: 2014-02-23T00:24:59-08:00
Author: tisto (tisto) <tisto at plone.org>
Commit: https://github.com/plone/plone.app.layout/commit/ed40b26124466ac1db6d10df40aef71fe41a4eae
Switch enable_sitemap setting from site_properties to p.a.registry.
Files changed:
M CHANGES.rst
M plone/app/layout/sitemap/sitemap.py
M setup.py
diff --git a/CHANGES.rst b/CHANGES.rst
index a93fb90..ba677d9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,13 @@
Changelog
=========
+2.5a1 (unreleased)
+------------------
+
+- Switch enable_sitemap setting from site_properties to p.a.registry.
+ [timo]
+
+
2.4a1 (unreleased)
------------------
diff --git a/plone/app/layout/sitemap/sitemap.py b/plone/app/layout/sitemap/sitemap.py
index 0ec938a..bf04a71 100644
--- a/plone/app/layout/sitemap/sitemap.py
+++ b/plone/app/layout/sitemap/sitemap.py
@@ -5,6 +5,10 @@
from Products.CMFPlone.interfaces import IPloneSiteRoot
from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
+from zope.component import getUtility
+from plone.registry.interfaces import IRegistry
+from plone.app.controlpanel.interfaces import ISiteSchema
+
from gzip import GzipFile
from cStringIO import StringIO
@@ -111,8 +115,9 @@ def generate(self):
def __call__(self):
"""Checks if the sitemap feature is enable and returns it."""
- sp = getToolByName(self.context, 'portal_properties').site_properties
- if not sp.enable_sitemap:
+ registry = getUtility(IRegistry)
+ settings = registry.forInterface(ISiteSchema)
+ if not settings.enable_sitemap:
raise NotFound(self.context, self.filename, self.request)
self.request.response.setHeader('Content-Type',
diff --git a/setup.py b/setup.py
index 5c62cef..17c8b42 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages
-version = '2.4a1.dev0'
+version = '2.5a1.dev0'
long_description = \
open("README.rst").read() + "\n" + open("CHANGES.rst").read()
Repository: plone.app.layout
Branch: refs/heads/master
Date: 2014-02-23T00:25:22-08:00
Author: tisto (tisto) <tisto at plone.org>
Commit: https://github.com/plone/plone.app.layout/commit/38b05b641e19d6125939f6bd921a398217593ae6
Switch webstats_js setting from site_properties to p.a.registry.
Files changed:
M CHANGES.rst
M plone/app/layout/analytics/tests/analytics.txt
M plone/app/layout/analytics/view.py
M plone/app/layout/globals/portal.py
M plone/app/layout/globals/tests/test_portal.py
M plone/app/layout/sitemap/tests/test_sitemap.py
diff --git a/CHANGES.rst b/CHANGES.rst
index ba677d9..9ec4378 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@ Changelog
2.5a1 (unreleased)
------------------
+- Switch webstats_js setting from site_properties to p.a.registry.
+ [timo]
+
- Switch enable_sitemap setting from site_properties to p.a.registry.
[timo]
diff --git a/plone/app/layout/analytics/tests/analytics.txt b/plone/app/layout/analytics/tests/analytics.txt
index e9025bd..bcb9266 100644
--- a/plone/app/layout/analytics/tests/analytics.txt
+++ b/plone/app/layout/analytics/tests/analytics.txt
@@ -14,17 +14,21 @@ Now we can instantiate the manager.
Set analytics (webstats_js) code through the controlpanel
- >>> props = self.portal.portal_properties.site_properties
- >>> props.webstats_js = u"<script>window.title='Hello'</script>"
+ >>> from plone.registry.interfaces import IRegistry
+ >>> from zope.component import getUtility
+ >>> from plone.app.controlpanel.interfaces import ISiteSchema
+ >>> registry = getUtility(IRegistry)
+ >>> site_settings = registry.forInterface(ISiteSchema)
+ >>> site_settings.webstats_js = u"<script>window.title='Hello'</script>"
>>> manager.update()
>>> text = manager.render()
- >>> props.webstats_js in text
+ >>> site_settings.webstats_js in text
True
Now enter some non-ascii text
- >>> props.webstats_js = u"<script>window.title='C\xedsa\u0159'</script>"
+ >>> site_settings.webstats_js = u"<script>window.title='C\xedsa\u0159'</script>"
>>> manager.update()
>>> text = manager.render()
- >>> props.webstats_js in text
+ >>> site_settings.webstats_js in text
True
diff --git a/plone/app/layout/analytics/view.py b/plone/app/layout/analytics/view.py
index 4c5ac79..e45eded 100644
--- a/plone/app/layout/analytics/view.py
+++ b/plone/app/layout/analytics/view.py
@@ -1,3 +1,7 @@
+from plone.app.controlpanel.interfaces import ISiteSchema
+from plone.registry.interfaces import IRegistry
+
+from zope.component import getUtility
from zope.interface import implements
from zope.viewlet.interfaces import IViewlet
@@ -22,6 +26,8 @@ def update(self):
def render(self):
"""render the webstats snippet"""
- ptool = getToolByName(self.context, "portal_properties")
- snippet = safe_unicode(ptool.site_properties.webstats_js)
- return snippet
+ registry = getUtility(IRegistry)
+ site_settings = registry.forInterface(ISiteSchema)
+ if site_settings.webstats_js:
+ return site_settings.webstats_js
+ return ''
diff --git a/plone/app/layout/globals/portal.py b/plone/app/layout/globals/portal.py
index bc838e1..b1c352d 100644
--- a/plone/app/layout/globals/portal.py
+++ b/plone/app/layout/globals/portal.py
@@ -1,5 +1,7 @@
from zope.interface import implements
-
+from zope.component import getUtility
+from plone.registry.interfaces import IRegistry
+from plone.app.controlpanel.interfaces import ISiteSchema
from plone.memoize.view import memoize_contextless
from plone.memoize.view import memoize
@@ -28,7 +30,9 @@ def portal(self):
@memoize_contextless
def portal_title(self):
- return self.portal().Title()
+ registry = getUtility(IRegistry)
+ settings = registry.forInterface(ISiteSchema)
+ return settings.site_title
@memoize_contextless
def portal_url(self):
diff --git a/plone/app/layout/globals/tests/test_portal.py b/plone/app/layout/globals/tests/test_portal.py
index d92d3be..91d1aa1 100644
--- a/plone/app/layout/globals/tests/test_portal.py
+++ b/plone/app/layout/globals/tests/test_portal.py
@@ -1,8 +1,11 @@
+from plone.registry.interfaces import IRegistry
+from plone.app.controlpanel.interfaces import ISiteSchema
from plone.app.layout.globals.tests.base import GlobalsTestCase
-
from plone.app.layout.navigation.interfaces import INavigationRoot
from plone.app.layout.navigation.root import getNavigationRoot
from zope.i18n.locales import locales
+from zope.component import getUtility
+
import zope.interface
@@ -17,7 +20,9 @@ def test_portal(self):
self.assertEqual(self.view.portal(), self.portal)
def test_portal_title(self):
- self.portal.title = 'My title'
+ registry = getUtility(IRegistry)
+ self.site_settings = registry.forInterface(ISiteSchema)
+ self.site_settings.site_title = u'My title'
self.assertEqual(self.view.portal_title(), 'My title')
def test_portal_url(self):
diff --git a/plone/app/layout/sitemap/tests/test_sitemap.py b/plone/app/layout/sitemap/tests/test_sitemap.py
index 7e31a05..2a491af 100644
--- a/plone/app/layout/sitemap/tests/test_sitemap.py
+++ b/plone/app/layout/sitemap/tests/test_sitemap.py
@@ -1,3 +1,7 @@
+from plone.registry.interfaces import IRegistry
+from zope.component import getUtility
+from plone.app.controlpanel.interfaces import ISiteSchema
+
from gzip import GzipFile
from StringIO import StringIO
@@ -18,6 +22,9 @@ class SiteMapTestCase(PloneTestCase):
def afterSetUp(self):
super(SiteMapTestCase, self).afterSetUp()
+ registry = getUtility(IRegistry)
+ self.site_settings = registry.forInterface(ISiteSchema)
+ self.site_settings.enable_sitemap = True
self.sitemap = getMultiAdapter((self.portal, self.portal.REQUEST),
name='sitemap.xml.gz')
self.wftool = getToolByName(self.portal, 'portal_workflow')
@@ -68,7 +75,7 @@ def test_disabled(self):
'''
If the sitemap is disabled throws a 404 error.
'''
- self.site_properties.manage_changeProperties(enable_sitemap=False)
+ self.site_settings.enable_sitemap = False
try:
self.sitemap()
except Exception, e:
Repository: plone.app.layout
Branch: refs/heads/master
Date: 2014-02-23T00:27:22-08:00
Author: tisto (tisto) <tisto at plone.org>
Commit: https://github.com/plone/plone.app.layout/commit/7b1006a3da153b555b53b5362411dcf846bd094a
ISiteSchema has been moved from p.a.controlpanel to P.CMFPlone.
Files changed:
M plone/app/layout/analytics/tests/analytics.txt
M plone/app/layout/analytics/view.py
M plone/app/layout/globals/portal.py
M plone/app/layout/globals/tests/test_portal.py
M plone/app/layout/sitemap/sitemap.py
M plone/app/layout/sitemap/tests/test_sitemap.py
diff --git a/plone/app/layout/analytics/tests/analytics.txt b/plone/app/layout/analytics/tests/analytics.txt
index bcb9266..331e87f 100644
--- a/plone/app/layout/analytics/tests/analytics.txt
+++ b/plone/app/layout/analytics/tests/analytics.txt
@@ -16,7 +16,7 @@ Set analytics (webstats_js) code through the controlpanel
>>> from plone.registry.interfaces import IRegistry
>>> from zope.component import getUtility
- >>> from plone.app.controlpanel.interfaces import ISiteSchema
+ >>> from Products.CMFPlone.interfaces import ISiteSchema
>>> registry = getUtility(IRegistry)
>>> site_settings = registry.forInterface(ISiteSchema)
>>> site_settings.webstats_js = u"<script>window.title='Hello'</script>"
diff --git a/plone/app/layout/analytics/view.py b/plone/app/layout/analytics/view.py
index e45eded..bc7457d 100644
--- a/plone/app/layout/analytics/view.py
+++ b/plone/app/layout/analytics/view.py
@@ -1,4 +1,4 @@
-from plone.app.controlpanel.interfaces import ISiteSchema
+from Products.CMFPlone.interfaces import ISiteSchema
from plone.registry.interfaces import IRegistry
from zope.component import getUtility
diff --git a/plone/app/layout/globals/portal.py b/plone/app/layout/globals/portal.py
index b1c352d..3e3b2e2 100644
--- a/plone/app/layout/globals/portal.py
+++ b/plone/app/layout/globals/portal.py
@@ -1,7 +1,7 @@
from zope.interface import implements
from zope.component import getUtility
from plone.registry.interfaces import IRegistry
-from plone.app.controlpanel.interfaces import ISiteSchema
+from Products.CMFPlone.interfaces import ISiteSchema
from plone.memoize.view import memoize_contextless
from plone.memoize.view import memoize
diff --git a/plone/app/layout/globals/tests/test_portal.py b/plone/app/layout/globals/tests/test_portal.py
index 91d1aa1..0d5e305 100644
--- a/plone/app/layout/globals/tests/test_portal.py
+++ b/plone/app/layout/globals/tests/test_portal.py
@@ -1,5 +1,5 @@
from plone.registry.interfaces import IRegistry
-from plone.app.controlpanel.interfaces import ISiteSchema
+from Products.CMFPlone.interfaces import ISiteSchema
from plone.app.layout.globals.tests.base import GlobalsTestCase
from plone.app.layout.navigation.interfaces import INavigationRoot
from plone.app.layout.navigation.root import getNavigationRoot
diff --git a/plone/app/layout/sitemap/sitemap.py b/plone/app/layout/sitemap/sitemap.py
index bf04a71..8713381 100644
--- a/plone/app/layout/sitemap/sitemap.py
+++ b/plone/app/layout/sitemap/sitemap.py
@@ -7,7 +7,7 @@
from zope.component import getUtility
from plone.registry.interfaces import IRegistry
-from plone.app.controlpanel.interfaces import ISiteSchema
+from Products.CMFPlone.interfaces import ISiteSchema
from gzip import GzipFile
from cStringIO import StringIO
diff --git a/plone/app/layout/sitemap/tests/test_sitemap.py b/plone/app/layout/sitemap/tests/test_sitemap.py
index 2a491af..937f34d 100644
--- a/plone/app/layout/sitemap/tests/test_sitemap.py
+++ b/plone/app/layout/sitemap/tests/test_sitemap.py
@@ -1,6 +1,6 @@
from plone.registry.interfaces import IRegistry
from zope.component import getUtility
-from plone.app.controlpanel.interfaces import ISiteSchema
+from Products.CMFPlone.interfaces import ISiteSchema
from gzip import GzipFile
from StringIO import StringIO
Repository: plone.app.layout
Branch: refs/heads/master
Date: 2014-02-23T00:30:04-08:00
Author: tisto (tisto) <tisto at plone.org>
Commit: https://github.com/plone/plone.app.layout/commit/46bc928b4bfb62ec190b905bae4c47fd7fc4e241
Use the plone-prefix for looking up ISiteSchema.
Files changed:
M plone/app/layout/analytics/tests/analytics.txt
M plone/app/layout/analytics/view.py
M plone/app/layout/globals/portal.py
M plone/app/layout/globals/tests/test_portal.py
M plone/app/layout/sitemap/sitemap.py
M plone/app/layout/sitemap/tests/test_sitemap.py
diff --git a/plone/app/layout/analytics/tests/analytics.txt b/plone/app/layout/analytics/tests/analytics.txt
index 331e87f..dc62bdb 100644
--- a/plone/app/layout/analytics/tests/analytics.txt
+++ b/plone/app/layout/analytics/tests/analytics.txt
@@ -18,7 +18,7 @@ Set analytics (webstats_js) code through the controlpanel
>>> from zope.component import getUtility
>>> from Products.CMFPlone.interfaces import ISiteSchema
>>> registry = getUtility(IRegistry)
- >>> site_settings = registry.forInterface(ISiteSchema)
+ >>> site_settings = registry.forInterface(ISiteSchema, prefix="plone")
>>> site_settings.webstats_js = u"<script>window.title='Hello'</script>"
>>> manager.update()
>>> text = manager.render()
diff --git a/plone/app/layout/analytics/view.py b/plone/app/layout/analytics/view.py
index bc7457d..963a541 100644
--- a/plone/app/layout/analytics/view.py
+++ b/plone/app/layout/analytics/view.py
@@ -27,7 +27,7 @@ def update(self):
def render(self):
"""render the webstats snippet"""
registry = getUtility(IRegistry)
- site_settings = registry.forInterface(ISiteSchema)
+ site_settings = registry.forInterface(ISiteSchema, prefix="plone")
if site_settings.webstats_js:
return site_settings.webstats_js
return ''
diff --git a/plone/app/layout/globals/portal.py b/plone/app/layout/globals/portal.py
index 3e3b2e2..b2b51e5 100644
--- a/plone/app/layout/globals/portal.py
+++ b/plone/app/layout/globals/portal.py
@@ -31,7 +31,7 @@ def portal(self):
@memoize_contextless
def portal_title(self):
registry = getUtility(IRegistry)
- settings = registry.forInterface(ISiteSchema)
+ settings = registry.forInterface(ISiteSchema, prefix="plone")
return settings.site_title
@memoize_contextless
diff --git a/plone/app/layout/globals/tests/test_portal.py b/plone/app/layout/globals/tests/test_portal.py
index 0d5e305..ba4959a 100644
--- a/plone/app/layout/globals/tests/test_portal.py
+++ b/plone/app/layout/globals/tests/test_portal.py
@@ -21,7 +21,7 @@ def test_portal(self):
def test_portal_title(self):
registry = getUtility(IRegistry)
- self.site_settings = registry.forInterface(ISiteSchema)
+ self.site_settings = registry.forInterface(ISiteSchema, prefix="plone")
self.site_settings.site_title = u'My title'
self.assertEqual(self.view.portal_title(), 'My title')
diff --git a/plone/app/layout/sitemap/sitemap.py b/plone/app/layout/sitemap/sitemap.py
index 8713381..144eaca 100644
--- a/plone/app/layout/sitemap/sitemap.py
+++ b/plone/app/layout/sitemap/sitemap.py
@@ -116,7 +116,7 @@ def generate(self):
def __call__(self):
"""Checks if the sitemap feature is enable and returns it."""
registry = getUtility(IRegistry)
- settings = registry.forInterface(ISiteSchema)
+ settings = registry.forInterface(ISiteSchema, prefix="plone")
if not settings.enable_sitemap:
raise NotFound(self.context, self.filename, self.request)
diff --git a/plone/app/layout/sitemap/tests/test_sitemap.py b/plone/app/layout/sitemap/tests/test_sitemap.py
index 937f34d..f150c3a 100644
--- a/plone/app/layout/sitemap/tests/test_sitemap.py
+++ b/plone/app/layout/sitemap/tests/test_sitemap.py
@@ -23,7 +23,7 @@ class SiteMapTestCase(PloneTestCase):
def afterSetUp(self):
super(SiteMapTestCase, self).afterSetUp()
registry = getUtility(IRegistry)
- self.site_settings = registry.forInterface(ISiteSchema)
+ self.site_settings = registry.forInterface(ISiteSchema, prefix="plone")
self.site_settings.enable_sitemap = True
self.sitemap = getMultiAdapter((self.portal, self.portal.REQUEST),
name='sitemap.xml.gz')
-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 16701 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140223/eed3c6ea/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 419800 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140223/eed3c6ea/attachment-0003.obj>
More information about the Testbot
mailing list