[Checkins] SVN: zope.app.exception/trunk/ require zope.browserpage instead of zope.app.pagetemplate
Jan-Wijbrand Kolman
janwijbrand at gmail.com
Mon Jan 4 10:17:16 EST 2010
Log message for revision 107631:
require zope.browserpage instead of zope.app.pagetemplate
Changed:
U zope.app.exception/trunk/CHANGES.txt
U zope.app.exception/trunk/setup.py
U zope.app.exception/trunk/src/zope/app/exception/browser/tests/test_unauthorized.py
U zope.app.exception/trunk/src/zope/app/exception/browser/unauthorized.py
-=-
Modified: zope.app.exception/trunk/CHANGES.txt
===================================================================
--- zope.app.exception/trunk/CHANGES.txt 2010-01-04 15:02:41 UTC (rev 107630)
+++ zope.app.exception/trunk/CHANGES.txt 2010-01-04 15:17:15 UTC (rev 107631)
@@ -4,6 +4,8 @@
3.6.1 (unreleased)
------------------
+- Require zope.browserpage which now contains ``namedtemplate``.
+
- Fix ftesting.zcml due to ``zope.securitypolicy`` update.
Modified: zope.app.exception/trunk/setup.py
===================================================================
--- zope.app.exception/trunk/setup.py 2010-01-04 15:02:41 UTC (rev 107630)
+++ zope.app.exception/trunk/setup.py 2010-01-04 15:17:15 UTC (rev 107631)
@@ -65,10 +65,10 @@
'zope.app.zptpage',
]),
install_requires=['setuptools',
- 'zope.app.pagetemplate>=3.6',
'zope.interface',
'zope.publisher',
'zope.browser>=1.2',
+ 'zope.browserpage>=3.11.0',
],
include_package_data = True,
zip_safe = False,
Modified: zope.app.exception/trunk/src/zope/app/exception/browser/tests/test_unauthorized.py
===================================================================
--- zope.app.exception/trunk/src/zope/app/exception/browser/tests/test_unauthorized.py 2010-01-04 15:02:41 UTC (rev 107630)
+++ zope.app.exception/trunk/src/zope/app/exception/browser/tests/test_unauthorized.py 2010-01-04 15:17:15 UTC (rev 107631)
@@ -17,7 +17,7 @@
"""
from unittest import TestCase, main, makeSuite
from zope import component, interface
-import zope.app.pagetemplate.namedtemplate
+import zope.browserpage.namedtemplate
from zope.publisher.browser import TestRequest
from zope.authentication.interfaces import IAuthentication
from zope.security.interfaces import IPrincipal
@@ -51,7 +51,7 @@
self.context = context
component.adapts(Unauthorized)
- interface.implements(zope.app.pagetemplate.namedtemplate.INamedTemplate)
+ interface.implements(zope.browserpage.namedtemplate.INamedTemplate)
def __call__(self):
return 'You are not authorized'
Modified: zope.app.exception/trunk/src/zope/app/exception/browser/unauthorized.py
===================================================================
--- zope.app.exception/trunk/src/zope/app/exception/browser/unauthorized.py 2010-01-04 15:02:41 UTC (rev 107630)
+++ zope.app.exception/trunk/src/zope/app/exception/browser/unauthorized.py 2010-01-04 15:17:15 UTC (rev 107631)
@@ -19,9 +19,9 @@
from zope.authentication.interfaces import IAuthentication
from zope.publisher.browser import BrowserPage
-from zope.app.pagetemplate import namedtemplate
+from zope.browserpage import namedtemplate
from zope.component import getUtility
-from zope.app.pagetemplate import ViewPageTemplateFile
+from zope.browserpage import ViewPageTemplateFile
class Unauthorized(BrowserPage):
More information about the checkins
mailing list