[Checkins] SVN: zam.api/trunk/ - Removed dependency on ``zc.configuration`` and most of the ``zope.app.*`` packages.
Michael Howitz
mh at gocept.com
Tue Dec 21 03:22:58 EST 2010
Log message for revision 119024:
- Removed dependency on ``zc.configuration`` and most of the ``zope.app.*`` packages.
Changed:
U zam.api/trunk/CHANGES.txt
U zam.api/trunk/setup.py
U zam.api/trunk/src/zam/api/app.zcml
U zam.api/trunk/src/zam/api/ftesting.zcml
U zam.api/trunk/src/zam/api/testing.py
-=-
Modified: zam.api/trunk/CHANGES.txt
===================================================================
--- zam.api/trunk/CHANGES.txt 2010-12-21 07:56:43 UTC (rev 119023)
+++ zam.api/trunk/CHANGES.txt 2010-12-21 08:22:57 UTC (rev 119024)
@@ -9,7 +9,8 @@
- Updated test set up and tests to run with ZTK 1.0 and current z3c.form
version.
-- Removed dependency on ``zope.app.twisted``.
+- Removed dependency on ``zope.app.twisted``, ``zc.configuration`` and most
+ of the ``zope.app.*`` packages.
- Using Python's ``doctest`` module instead of depreacted
``zope.testing.doctestunit``.
Modified: zam.api/trunk/setup.py
===================================================================
--- zam.api/trunk/setup.py 2010-12-21 07:56:43 UTC (rev 119023)
+++ zam.api/trunk/setup.py 2010-12-21 08:22:57 UTC (rev 119024)
@@ -54,24 +54,21 @@
'z3c.baseregistry',
'z3c.zrtresource',
'zope.annotation',
- 'zope.app.broken',
- 'zope.app.component',
- 'zope.app.error',
- 'zope.app.keyreference',
- 'zope.app.i18n',
- 'zope.app.intid',
- 'zope.app.principalannotation',
- 'zope.app.schema',
- 'zope.app.securitypolicy',
- 'zope.app.server',
- 'zope.app.testing',
- 'zope.app.session',
- 'zope.app.zopeappgenerations',
+ 'zope.app.wsgi',
+ 'zope.broken',
+ 'zope.component',
+ 'zope.error',
+ 'zope.intid',
+ 'zope.keyreference',
+ 'zope.principalregistry',
+ 'zope.securitypolicy',
+ 'zope.session',
'zope.site',
],
test = [
'z3c.pt',
'z3c.ptcompat',
+ 'zope.app.testing',
'zope.site',
'zope.testbrowser',
'zope.testing',
@@ -87,7 +84,6 @@
'z3c.menu.ready2go',
'z3c.pagelet',
'z3c.template',
- 'zc.configuration',
'zope.app.renderer',
'zope.component',
'zope.contentprovider',
Modified: zam.api/trunk/src/zam/api/app.zcml
===================================================================
--- zam.api/trunk/src/zam/api/app.zcml 2010-12-21 07:56:43 UTC (rev 119023)
+++ zam.api/trunk/src/zam/api/app.zcml 2010-12-21 08:22:57 UTC (rev 119024)
@@ -8,42 +8,20 @@
all different app configuration setup in zam.* and zamplugin.* packages.
-->
- <!-- load meta configuration for exclude -->
- <include package="zc.configuration" file="meta.zcml" />
-
- <!-- exclude will prevent from include -->
- <exclude package="zope.app.authentication" file="ftpplugins.zcml" />
- <exclude package="zope.app.authentication" file="groupfolder.zcml" />
- <exclude package="zope.app.authentication" file="principalfolder.zcml" />
- <exclude package="zope.app.authentication.browser" />
- <exclude package="zope.app.authentication.browser" file="configure.zcml" />
- <exclude package="zope.app.authentication.browser" file="groupfolder.zcml" />
- <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.container.browser" />
- <exclude package="zope.app.error.browser" />
- <exclude package="zope.app.i18n.browser" />
- <exclude package="zope.app.intid.browser" />
- <exclude package="zope.app.securitypolicy.browser" />
- <exclude package="zope.app.session" file="browser.zcml" />
- <exclude package="zope.dublincore.browser" />
-
-
<!-- meta configure -->
- <include package="zope.app.container.browser" file="meta.zcml" />
<include package="zope.app.pagetemplate" file="meta.zcml" />
<include package="zope.app.publication" file="meta.zcml" />
- <include package="zope.app.publisher" file="meta.zcml" />
- <include package="zope.app.security" file="meta.zcml" />
+ <include package="zope.publisher" file="meta.zcml" />
+ <include package="zope.security" file="meta.zcml" />
<include package="zope.component" file="meta.zcml" />
<include package="zope.i18n" file="meta.zcml" />
<include package="zope.security" file="meta.zcml" />
<include package="zope.securitypolicy" file="meta.zcml" />
<include package="zope.viewlet" file="meta.zcml" />
+ <include package="zope.browserpage" file="meta.zcml" />
+ <include package="zope.browserresource" file="meta.zcml" />
+ <include package="zope.principalregistry" file="meta.zcml" />
-
<!-- load 3rd party meta configuration -->
<include package="z3c.baseregistry" file="meta.zcml" />
<include package="z3c.form" file="meta.zcml" />
@@ -53,16 +31,10 @@
<include package="z3c.zrtresource" file="meta.zcml" />
- <!-- vocabulary setup, that's bad and weird, because this is meta configuration -->
- <include package="zope.app.schema" />
-
-
<!-- bootstrap Database -->
<include package="zope.app.appsetup" />
- <include package="zope.app.zopeappgenerations" />
<!-- zope server -->
- <include package="zope.app.server" />
<include package="zope.app.wsgi" />
@@ -81,22 +53,19 @@
<include package="zope.traversing" />
<include package="zope.traversing.browser" />
<include package="zope.login" />
+ <include package="zope.principalregistry" />
+ <include package="zope.password" />
<!-- zope app package configuration -->
- <include package="zope.app.authentication" />
- <include package="zope.app.broken" />
- <include package="zope.app.component" />
- <include package="zope.app.container" />
- <include package="zope.app.http" />
- <include package="zope.app.intid" />
- <include package="zope.app.keyreference" />
- <include package="zope.app.principalannotation" />
+ <include package="zope.component" />
+ <include package="zope.container" />
+ <include package="zope.intid" />
+ <include package="zope.keyreference" />
<include package="zope.app.publication" />
- <include package="zope.app.publisher" />
- <include package="zope.app.publisher.browser" />
- <include package="zope.app.security" />
- <include package="zope.app.securitypolicy" />
- <include package="zope.app.session" />
+ <include package="zope.publisher" />
+ <include package="zope.security" />
+ <include package="zope.securitypolicy" />
+ <include package="zope.session" />
<!-- z3c component -->
@@ -123,12 +92,6 @@
provides="zope.i18n.interfaces.IUserPreferredCharsets"
/>
- <adapter
- factory="zope.app.publisher.browser.ModifiableBrowserLanguages"
- for="zope.publisher.interfaces.http.IHTTPRequest"
- provides="zope.i18n.interfaces.IModifiableUserPreferredLanguages"
- />
-
<class class="zope.publisher.http.HTTPRequest">
<implements
interface="zope.annotation.interfaces.IAttributeAnnotatable"
Modified: zam.api/trunk/src/zam/api/ftesting.zcml
===================================================================
--- zam.api/trunk/src/zam/api/ftesting.zcml 2010-12-21 07:56:43 UTC (rev 119023)
+++ zam.api/trunk/src/zam/api/ftesting.zcml 2010-12-21 08:22:57 UTC (rev 119024)
@@ -28,7 +28,7 @@
<require
permission="zope.Public"
attributes="title testAttr"
- interface="zope.app.container.interfaces.IContained"
+ interface="zope.container.interfaces.IContained"
/>
<require
permission="zope.ManageSite"
Modified: zam.api/trunk/src/zam/api/testing.py
===================================================================
--- zam.api/trunk/src/zam/api/testing.py 2010-12-21 07:56:43 UTC (rev 119023)
+++ zam.api/trunk/src/zam/api/testing.py 2010-12-21 08:22:57 UTC (rev 119024)
@@ -11,25 +11,18 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
-$Id: __init__.py 97 2007-03-29 22:58:27Z rineichen $
-"""
-__docformat__ = "reStructuredText"
-
-import zope.interface
-import zope.component
-import zope.schema
-from zope.schema.fieldproperty import FieldProperty
+from z3c.baseregistry import baseregistry
+from zam.api import plugin
+from zam.api.i18n import MessageFactory as _
from zope.annotation.interfaces import IAttributeAnnotatable
from zope.location.interfaces import IPossibleSite
+from zope.schema.fieldproperty import FieldProperty
from zope.site import folder
-from zope.app.component import site
+import zope.component
+import zope.interface
+import zope.schema
+import zope.site.site
-from z3c.baseregistry import baseregistry
-
-from zam.api.i18n import MessageFactory as _
-from zam.api import plugin
-
###############################################################################
#
# ZAM test site used in different zam package tests
@@ -66,7 +59,7 @@
self.title = title
# setup site manager
- self.setSiteManager(site.LocalSiteManager(self))
+ self.setSiteManager(zope.site.site.LocalSiteManager(self))
def __repr__(self):
return '<%s %r>' % (self.__class__.__name__, self.__name__)
More information about the checkins
mailing list