[Checkins] SVN: z3c.layer.pagelet/trunk/ - Removed not needed test-dependency on ``zope.app.zcmlfiles``.
Michael Howitz
mh at gocept.com
Mon Mar 16 15:10:55 EDT 2009
Log message for revision 98152:
- Removed not needed test-dependency on ``zope.app.zcmlfiles``.
- Fixed namespace package declaration in ``setup.py``.
Changed:
U z3c.layer.pagelet/trunk/CHANGES.txt
U z3c.layer.pagelet/trunk/setup.py
U z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/login.txt
U z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml
-=-
Modified: z3c.layer.pagelet/trunk/CHANGES.txt
===================================================================
--- z3c.layer.pagelet/trunk/CHANGES.txt 2009-03-16 18:34:12 UTC (rev 98151)
+++ z3c.layer.pagelet/trunk/CHANGES.txt 2009-03-16 19:10:55 UTC (rev 98152)
@@ -8,7 +8,11 @@
- Removed direct dependency on ``zope.app.security`` by using the new
packages ``zope.authentication`` and ``zope.principalregistry``.
+- Removed not needed test-dependency on ``zope.app.zcmlfiles``.
+- Fixed namespace package declaration in ``setup.py``.
+
+
1.3.0 (2009-03-13)
------------------
Modified: z3c.layer.pagelet/trunk/setup.py
===================================================================
--- z3c.layer.pagelet/trunk/setup.py 2009-03-16 18:34:12 UTC (rev 98151)
+++ z3c.layer.pagelet/trunk/setup.py 2009-03-16 19:10:55 UTC (rev 98152)
@@ -54,13 +54,13 @@
packages = find_packages('src'),
include_package_data = True,
package_dir = {'':'src'},
- namespace_packages = ['z3c'],
+ namespace_packages = ['z3c', 'z3c.layer'],
extras_require = dict(
test = [
'zope.testbrowser',
'zope.securitypolicy',
'zope.app.testing',
- 'zope.app.zcmlfiles',
+ 'zope.app.i18n',
'zope.app.twisted',
'zope.configuration>=3.5.0',
'zope.component',
Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/login.txt
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/login.txt 2009-03-16 18:34:12 UTC (rev 98151)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/login.txt 2009-03-16 19:10:55 UTC (rev 98152)
@@ -269,23 +269,26 @@
>>> from zope.authentication.interfaces import IAuthentication
>>> from zope.app.authentication.interfaces import IAuthenticatorPlugin
- >>> from zope.app.appsetup.bootstrap import ensureUtility
>>> from zope.app.authentication.authentication import PluggableAuthentication
>>> from zope.app.authentication.principalfolder import PrincipalFolder
>>> from zope.site import site
- >>> auth = ensureUtility(
- ... getRootFolder(), IAuthentication, '', PluggableAuthentication,
- ... asObject=True)
- >>> auth.credentialsPlugins = (u'Session Credentials',)
- >>> principal_folder = ensureUtility(getRootFolder(), IAuthenticatorPlugin,
- ... '', PrincipalFolder, name=u'principal_folder', asObject=True)
- >>> auth.authenticatorPlugins = (u'principal_folder',)
+ >>> root = getRootFolder()
+ >>> root['principal_folder'] = PrincipalFolder()
+ >>> sm = root.getSiteManager()
+ >>> sm.registerUtility(
+ ... root['principal_folder'], IAuthenticatorPlugin, 'principal_folder')
+ >>> root['auth'] = PluggableAuthentication()
+ >>> sm.registerUtility(root['auth'], IAuthentication, '')
+ >>> root['auth'].credentialsPlugins = (u'Session Credentials',)
+ >>> root['auth'].authenticatorPlugins = (u'principal_folder',)
+
We need a principal inside the principal folder:
>>> from zope.app.authentication.principalfolder import InternalPrincipal
- >>> principal_folder['1'] = InternalPrincipal('tester', 'tpass', 'Tester')
+ >>> root['principal_folder']['1'] = InternalPrincipal(
+ ... 'tester', 'tpass', 'Tester')
We use a new browser, so the principal is not logged in and the login
Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml 2009-03-16 18:34:12 UTC (rev 98151)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml 2009-03-16 19:10:55 UTC (rev 98152)
@@ -14,8 +14,6 @@
<exclude package="zope.app.authentication.browser" file="httpplugins.zcml" />
<exclude package="zope.app.authentication.browser" file="principalfolder.zcml" />
<exclude package="zope.app.authentication.browser" file="session.zcml" />
- <exclude package="zope.app.broken" file="browser.zcml" />
- <exclude package="zope.app.error.browser" />
<exclude package="zope.app.i18n.browser" />
<exclude package="zope.dublincore.browser" />
@@ -29,8 +27,8 @@
<include package="zope.principalregistry" file="meta.zcml" />
<include package="zope.securitypolicy" file="meta.zcml" />
<include package="zope.viewlet" file="meta.zcml" />
+ <include package="zope.security" file="meta.zcml" />
-
<!-- 3rd party meta configure -->
<include package="z3c.pagelet" file="meta.zcml" />
<include package="z3c.template" file="meta.zcml" />
@@ -43,7 +41,6 @@
<include package="zope.app.appsetup" />
<include package="zope.app.component" />
<include package="zope.container" />
- <include package="zope.app.error" />
<include package="zope.app.http.exception" />
<include package="zope.app.i18n" />
<include package="zope.app.publication" />
More information about the Checkins
mailing list