[Checkins] SVN: zope.app.form/trunk/ Refactored code to remove zope.app.component dependency.
Hanno Schlichting
hannosch at hannosch.eu
Thu Dec 17 17:28:42 EST 2009
Log message for revision 106721:
Refactored code to remove zope.app.component dependency.
Changed:
U zope.app.form/trunk/CHANGES.txt
U zope.app.form/trunk/setup.py
U zope.app.form/trunk/src/zope/app/form/browser/form.txt
U zope.app.form/trunk/src/zope/app/form/browser/tests/registerWidgets.zcml
U zope.app.form/trunk/src/zope/app/form/browser/tests/support.py
U zope.app.form/trunk/src/zope/app/form/browser/tests/test_add.py
U zope.app.form/trunk/src/zope/app/form/browser/tests/test_directives.py
U zope.app.form/trunk/src/zope/app/form/browser/tests/widgetDirectives.zcml
-=-
Modified: zope.app.form/trunk/CHANGES.txt
===================================================================
--- zope.app.form/trunk/CHANGES.txt 2009-12-17 22:18:43 UTC (rev 106720)
+++ zope.app.form/trunk/CHANGES.txt 2009-12-17 22:28:42 UTC (rev 106721)
@@ -5,6 +5,8 @@
3.11.0 (unreleased)
===================
+- Refactored code to remove zope.app.component dependency.
+
- Made the tests independent of zope.app.locales.
- Reduce zope.app test dependencies by avoiding zope.app.securitypolicy and
Modified: zope.app.form/trunk/setup.py
===================================================================
--- zope.app.form/trunk/setup.py 2009-12-17 22:18:43 UTC (rev 106720)
+++ zope.app.form/trunk/setup.py 2009-12-17 22:28:42 UTC (rev 106721)
@@ -75,7 +75,6 @@
'zope.traversing',
'zope.app.appsetup',
'zope.app.basicskin',
- 'zope.app.component',
'zope.app.container',
'zope.app.publication',
'zope.app.publisher',
Modified: zope.app.form/trunk/src/zope/app/form/browser/form.txt
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/form.txt 2009-12-17 22:18:43 UTC (rev 106720)
+++ zope.app.form/trunk/src/zope/app/form/browser/form.txt 2009-12-17 22:28:42 UTC (rev 106721)
@@ -102,8 +102,8 @@
>>> from zope.configuration import xmlconfig
- >>> import zope.app.component
- >>> context = xmlconfig.file('meta.zcml', zope.app.component)
+ >>> import zope.component
+ >>> context = xmlconfig.file('meta.zcml', zope.component)
>>> import zope.app.form.browser
>>> context = xmlconfig.file('meta.zcml', zope.app.form.browser, context)
Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/registerWidgets.zcml
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/registerWidgets.zcml 2009-12-17 22:18:43 UTC (rev 106720)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/registerWidgets.zcml 2009-12-17 22:28:42 UTC (rev 106721)
@@ -2,7 +2,8 @@
xmlns="http://namespaces.zope.org/zope"
i18n_domain="zope">
- <include package="zope.app.component" file="meta.zcml" />
+ <include package="zope.component" file="meta.zcml" />
+ <include package="zope.security" file="meta.zcml" />
<include package="zope.browserpage" file="meta.zcml" />
<include package="zope.app.form.browser" file="configure.zcml" />
Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/support.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/support.py 2009-12-17 22:18:43 UTC (rev 106720)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/support.py 2009-12-17 22:28:42 UTC (rev 106721)
@@ -66,7 +66,7 @@
schema = schema.__identifier__
xmlconfig.string("""
<configure xmlns="http://namespaces.zope.org/zope">
- <include package="zope.app.component" file="meta.zcml" />
+ <include package="zope.security" file="meta.zcml" />
<class class="%s">
<require
permission="zope.Public"
@@ -83,7 +83,7 @@
view_type = '%s.%s' % (view_type.__module__, view_type.__name__)
xmlconfig.string("""
<configure xmlns="http://namespaces.zope.org/zope">
- <include package="zope.app.component" file="meta.zcml" />
+ <include package="zope.component" file="meta.zcml" />
<view
for="%s"
type="zope.publisher.interfaces.browser.IBrowserRequest"
Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_add.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_add.py 2009-12-17 22:18:43 UTC (rev 106720)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_add.py 2009-12-17 22:28:42 UTC (rev 106721)
@@ -19,19 +19,19 @@
from zope.browser.interfaces import IAdding
from zope.component import getMultiAdapter
+from zope.component.eventtesting import getEvents
from zope.component.interfaces import IFactory
from zope.component.interfaces import IComponentLookup
from zope.component.factory import Factory
from zope.interface import Interface, implements
+from zope.lifecycleevent.interfaces import IObjectCreatedEvent, IObjectModifiedEvent
from zope.publisher.browser import TestRequest
from zope.publisher.interfaces.browser import IBrowserRequest
from zope.publisher.interfaces.browser import IDefaultBrowserLayer
from zope.schema import TextLine, accessors
from zope.security.checker import CheckerPublic
-from zope.component.eventtesting import getEvents
-from zope.lifecycleevent.interfaces import IObjectCreatedEvent, IObjectModifiedEvent
+from zope.site.site import SiteManagerAdapter
-from zope.app.component.site import SiteManagerAdapter
from zope.app.form import CustomWidgetFactory
from zope.app.form.browser import TextWidget as Text
from zope.app.form.browser.add import AddViewFactory, AddView
Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_directives.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_directives.py 2009-12-17 22:18:43 UTC (rev 106720)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_directives.py 2009-12-17 22:28:42 UTC (rev 106721)
@@ -15,20 +15,17 @@
$Id$
"""
-import os
import unittest
from cStringIO import StringIO
from zope import component
-from zope.component.interfaces import ComponentLookupError
from zope.configuration.xmlconfig import xmlconfig, XMLConfig
from zope.traversing.interfaces import TraversalError
from zope.interface import Interface, implements
from zope.publisher.browser import TestRequest
from zope.schema import TextLine, Int
-from zope.security.proxy import ProxyFactory
-import zope.app.component
+import zope.component
import zope.app.form.browser
import zope.browsermenu
from zope.app.form.browser import TextWidget
@@ -74,11 +71,10 @@
def setUp(self):
super(Test, self).setUp()
- XMLConfig('meta.zcml', zope.app.component)()
+ XMLConfig('meta.zcml', zope.component)()
XMLConfig('meta.zcml', zope.app.form.browser)()
XMLConfig('meta.zcml', zope.browsermenu)()
- from zope.app.testing import ztapi
from zope.traversing.adapters import DefaultTraversable
from zope.traversing.interfaces import ITraversable
Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/widgetDirectives.zcml
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/widgetDirectives.zcml 2009-12-17 22:18:43 UTC (rev 106720)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/widgetDirectives.zcml 2009-12-17 22:28:42 UTC (rev 106721)
@@ -2,7 +2,7 @@
xmlns:zope="http://namespaces.zope.org/zope"
i18n_domain="zope">
- <include package="zope.app.component" file="meta.zcml" />
+ <include package="zope.component" file="meta.zcml" />
<include package="zope.app.form.browser" file="meta.zcml" />
<zope:view
More information about the checkins
mailing list