[Checkins] SVN: z3ext.controlpanel/trunk/s use latest zope packages; update tests
Nikolay Kim
fafhrd91 at gmail.com
Tue Dec 22 18:19:51 EST 2009
Log message for revision 106964:
use latest zope packages; update tests
Changed:
U z3ext.controlpanel/trunk/setup.py
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/configure.zcml
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/configure.zcml
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/meta.zcml
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/ftesting.zcml
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/interfaces.py
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/testbrowser.txt
-=-
Modified: z3ext.controlpanel/trunk/setup.py
===================================================================
--- z3ext.controlpanel/trunk/setup.py 2009-12-22 23:19:09 UTC (rev 106963)
+++ z3ext.controlpanel/trunk/setup.py 2009-12-22 23:19:50 UTC (rev 106964)
@@ -47,7 +47,7 @@
'Framework :: Zope3'],
author = 'Nikolay Kim',
author_email = 'fafhrd91 at gmail.com',
- url='http://z3ext.net/',
+ url='http://pypi.python.org/pypi/z3ext.controlpanel/',
license='ZPL 2.1',
packages=find_packages('src'),
package_dir = {'':'src'},
@@ -76,9 +76,9 @@
],
extras_require = dict(test=['zope.securitypolicy',
'zope.app.testing',
- 'zope.app.zcmlfiles',
'zope.testing',
'zope.testbrowser',
+ 'zope.principalregistry',
'z3c.breadcrumb',
'z3ext.wizard',
'z3ext.security',
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/configure.zcml
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/configure.zcml 2009-12-22 23:19:09 UTC (rev 106963)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/configure.zcml 2009-12-22 23:19:50 UTC (rev 106964)
@@ -20,13 +20,6 @@
name="index.html"
for="..interfaces.IConfiglet" />
- <browser:menuItem
- for="..interfaces.IConfiglet"
- title="View"
- menu="zmi_views"
- action="index.html"
- permission="zope.Public" />
-
<z3ext:pagelet
name="index.html"
for="..interfaces.IConfiglet"
@@ -48,19 +41,6 @@
class=".navigation.Navigation"
permission="zope.Public" />
- <!-- for ILocalSiteManager -->
- <browser:menuItem
- for="zope.app.component.interfaces.ISite"
- menu="zmi_actions"
- title="System settings"
- action="settings/"
- permission="z3ext.Configure" />
-
- <browser:containerViews
- for="..interfaces.IConfigletDataStorage"
- index="z3ext.Configure"
- contents="z3ext.Configure" />
-
<!-- configlet breadcrumb -->
<adapter
zcml:condition="installed z3c.breadcrumb"
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/configure.zcml
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/configure.zcml 2009-12-22 23:19:09 UTC (rev 106963)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/configure.zcml 2009-12-22 23:19:50 UTC (rev 106964)
@@ -26,14 +26,14 @@
<class class=".storage.ConfigletData">
<require
- permission="zope.ManageApplication"
- interface="zope.app.container.interfaces.IContainer" />
+ permission="zope.ManageServices"
+ interface="zope.container.interfaces.IContainer" />
</class>
<class class=".storage.ConfigletDataStorage">
<require
- permission="zope.ManageApplication"
- interface="zope.app.container.interfaces.IContainer" />
+ permission="zope.ManageServices"
+ interface="zope.container.interfaces.IContainer" />
</class>
<!-- default categories -->
@@ -71,7 +71,7 @@
<!-- settings view -->
<adapter
name="settings"
- for="zope.app.component.interfaces.ISite *"
+ for="zope.component.interfaces.ISite *"
provides="zope.interface.Interface"
factory=".root.getSettings" />
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/meta.zcml
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/meta.zcml 2009-12-22 23:19:09 UTC (rev 106963)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/meta.zcml 2009-12-22 23:19:50 UTC (rev 106964)
@@ -10,11 +10,11 @@
<meta:subdirective
name="allow"
- schema="zope.app.component.metadirectives.IAllowSubdirective" />
+ schema="zope.security.metadirectives.IAllowSubdirective" />
<meta:subdirective
name="require"
- schema="zope.app.component.metadirectives.IRequireSubdirective" />
+ schema="zope.security.metadirectives.IRequireSubdirective" />
</meta:complexDirective>
</meta:directives>
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/ftesting.zcml
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/ftesting.zcml 2009-12-22 23:19:09 UTC (rev 106963)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/ftesting.zcml 2009-12-22 23:19:50 UTC (rev 106964)
@@ -3,6 +3,8 @@
xmlns:browser="http://namespaces.zope.org/browser"
i18n_domain="zope">
+ <exclude package="zope.dublincore.browser" />
+
<include package="z3ext.autoinclude" file="meta.zcml" />
<includeAllDependencies package="z3ext.controlpanel" extras="test" />
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/interfaces.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/interfaces.py 2009-12-22 23:19:09 UTC (rev 106963)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/interfaces.py 2009-12-22 23:19:50 UTC (rev 106964)
@@ -16,11 +16,11 @@
$Id$
"""
from zope import schema, interface
-from zope.app.rotterdam import Rotterdam
+from zope.publisher.interfaces.browser import IDefaultBrowserLayer
from z3ext.layoutform.interfaces import ILayoutFormLayer
-class IDefaultSkin(ILayoutFormLayer, Rotterdam):
+class IDefaultSkin(ILayoutFormLayer, IDefaultBrowserLayer):
""" my skin """
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/testbrowser.txt
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/testbrowser.txt 2009-12-22 23:19:09 UTC (rev 106963)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/testbrowser.txt 2009-12-22 23:19:50 UTC (rev 106964)
@@ -28,14 +28,8 @@
We should have 'System settings' link in ISite actions menu
- >>> browser.open("http://localhost/@@contents.html")
+ >>> browser.open("http://localhost/settings/")
>>> print browser.contents
- <!DOCTYPE html PUBLIC...
- ...<li><a href="settings/">System settings</a></li>...
- <BLANKLINE>
-
- >>> browser.getLink('System settings').click()
- >>> print browser.contents
<html>
...System settings...
</html>
More information about the checkins
mailing list