[Checkins] SVN: zc.form/trunk/ - Got rid of ``zope.app.component`` dependency by requiring at least ``zope.component`` 3.8.
Michael Howitz
mh at gocept.com
Fri Sep 23 03:17:02 EST 2011
Log message for revision 122901:
- Got rid of ``zope.app.component`` dependency by requiring at least ``zope.component`` 3.8.
- Depending on ``zope.browserpage`` and ``zope.container`` instead of ``zope.app.publisher``.
Changed:
U zc.form/trunk/CHANGES.txt
U zc.form/trunk/setup.py
U zc.form/trunk/src/zc/form/browser/ftesting.zcml
U zc.form/trunk/src/zc/form/browser/mruwidget.txt
-=-
Modified: zc.form/trunk/CHANGES.txt
===================================================================
--- zc.form/trunk/CHANGES.txt 2011-09-23 08:06:36 UTC (rev 122900)
+++ zc.form/trunk/CHANGES.txt 2011-09-23 08:17:01 UTC (rev 122901)
@@ -8,10 +8,17 @@
- Got rid of ``zope.app.form`` dependency by requiring at least
``zope.formlib`` 4.0.
+- Got rid of ``zope.app.component`` dependency by requiring at least
+ ``zope.component`` 3.8.
+
+
- Depending on ``zope.catalog`` instead of ``zope.app.catalog``.
- Depending on ``zope.security`` instead of ``zope.app.security``.
+- Depending on ``zope.browserpage`` and ``zope.container`` instead of
+ ``zope.app.publisher``.
+
- Got rid of the following dependencies:
- ``zope.app.basicskin``
Modified: zc.form/trunk/setup.py
===================================================================
--- zc.form/trunk/setup.py 2011-09-23 08:06:36 UTC (rev 122900)
+++ zc.form/trunk/setup.py 2011-09-23 08:17:01 UTC (rev 122901)
@@ -33,7 +33,7 @@
'zope.catalog',
'zope.app.pagetemplate',
'zope.cachedescriptors',
- 'zope.component',
+ 'zope.component >= 3.8',
'zope.exceptions',
'zope.formlib >= 4.0',
'zope.i18n',
@@ -49,7 +49,8 @@
'zope.configuration',
'zope.testing',
'zope.traversing',
- 'zope.app.component',
+ 'zope.browserpage',
+ 'zope.container',
],
zip_safe=False
)
Modified: zc.form/trunk/src/zc/form/browser/ftesting.zcml
===================================================================
--- zc.form/trunk/src/zc/form/browser/ftesting.zcml 2011-09-23 08:06:36 UTC (rev 122900)
+++ zc.form/trunk/src/zc/form/browser/ftesting.zcml 2011-09-23 08:17:01 UTC (rev 122901)
@@ -5,20 +5,19 @@
i18n_domain="zc.catalog"
>
+ <exclude package="zope.app.principalannotation" file="browser.zcml"/>
+
<include package="zope.component" file="meta.zcml" />
+ <include package="zope.browserpage" file="meta.zcml" />
<include package="zope.security" file="meta.zcml" />
- <include package="zope.app.component" file="meta.zcml" />
- <include package="zope.app.publisher" file="meta.zcml" />
<include package="zope.app.publication" file="meta.zcml" />
<include package="zope.app.pagetemplate" file="meta.zcml" />
<include package="zc.resourcelibrary" file="meta.zcml" />
<include package="zope.component" />
<include package="zope.security" />
- <include package="zope.app.component" />
- <include package="zope.app.container" />
+ <include package="zope.container" />
<include package="zope.publisher" />
- <include package="zope.app.publisher" />
<include package="zope.app.publication" />
<include package="zope.app.pagetemplate" file="meta.zcml" />
<include package="zope.app.appsetup" />
Modified: zc.form/trunk/src/zc/form/browser/mruwidget.txt
===================================================================
--- zc.form/trunk/src/zc/form/browser/mruwidget.txt 2011-09-23 08:06:36 UTC (rev 122900)
+++ zc.form/trunk/src/zc/form/browser/mruwidget.txt 2011-09-23 08:17:01 UTC (rev 122901)
@@ -42,7 +42,7 @@
>>> import zope.publisher.browser
>>> import zope.security.interfaces
>>> import zope.security.management
- >>> import zope.app.component.hooks
+ >>> import zope.component.hooks
>>> class DummyPrincipal(object):
... zope.interface.implements(zope.security.interfaces.IPrincipal)
@@ -68,8 +68,8 @@
>>> request.setPrincipal(principal)
>>> zope.security.management.newInteraction(request)
- >>> oldsite = zope.app.component.hooks.getSite()
- >>> zope.app.component.hooks.setSite(getRootFolder())
+ >>> oldsite = zope.component.hooks.getSite()
+ >>> zope.component.hooks.setSite(getRootFolder())
Now we can use an instance of our demo object to see that the form
pulls the possible values from the vocabulary we've defined above::
@@ -148,4 +148,4 @@
Clean up a bit::
>>> zope.security.management.endInteraction()
- >>> zope.app.component.hooks.setSite(oldsite)
+ >>> zope.component.hooks.setSite(oldsite)
More information about the checkins
mailing list