[Checkins] SVN: zope.app.form/trunk/ cleaned up dependencies a bit, reducing that on zope.app.publisher to zope.browsermenu
Thomas Lotze
tl at gocept.com
Thu Oct 8 02:06:50 EDT 2009
Log message for revision 104906:
cleaned up dependencies a bit, reducing that on zope.app.publisher to zope.browsermenu
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/metaconfigure.py
U zope.app.form/trunk/src/zope/app/form/browser/metadirectives.py
U zope.app.form/trunk/src/zope/app/form/browser/tests/registerWidgets.zcml
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-10-08 05:18:53 UTC (rev 104905)
+++ zope.app.form/trunk/CHANGES.txt 2009-10-08 06:06:50 UTC (rev 104906)
@@ -2,12 +2,14 @@
CHANGES
=======
-3.8.2 (unreleased)
+3.9.0 (unreleased)
==================
- Internationalized 'Invalid value' used with ConversionError
-- Added dependency on transaction.
-- Moved dependency on ZODB3 to the test extra.
+- Added dependency on transaction and test dependency on zope.app.component.
+- Moved dependencies on ZODB3 and zope.location to the test extra.
+- Reduced the dependency on zope.app.publisher to a dependency on
+ zope.browsermenu plus a test dependency on zope.browserpage.
3.8.1 (2009-07-23)
==================
Modified: zope.app.form/trunk/setup.py
===================================================================
--- zope.app.form/trunk/setup.py 2009-10-08 05:18:53 UTC (rev 104905)
+++ zope.app.form/trunk/setup.py 2009-10-08 06:06:50 UTC (rev 104906)
@@ -27,7 +27,7 @@
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
setup(name='zope.app.form',
- version = '3.8.2dev',
+ version = '3.9.0dev',
author='Zope Corporation and Contributors',
author_email='zope-dev at zope.org',
description='The Original Zope 3 Form Framework',
@@ -64,16 +64,21 @@
packages=find_packages('src'),
package_dir = {'': 'src'},
namespace_packages=['zope', 'zope.app'],
- extras_require={"test": ['zope.app.testing',
- 'zope.app.securitypolicy',
- 'zc.sourcefactory',
- 'zope.app.zcmlfiles',
- 'ZODB3']},
+ extras_require={'test': [
+ 'ZODB3',
+ 'zc.sourcefactory',
+ 'zope.app.component',
+ 'zope.app.securitypolicy',
+ 'zope.app.testing',
+ 'zope.app.zcmlfiles',
+ 'zope.browserpage',
+ 'zope.location',
+ ]},
install_requires=[
"setuptools",
"transaction",
"zope.browser >= 1.1",
- "zope.app.publisher",
+ "zope.browsermenu",
"zope.component",
"zope.configuration",
"zope.exceptions",
@@ -84,7 +89,6 @@
"zope.schema>=3.5.1dev",
"zope.security",
"zope.app.basicskin",
- "zope.location",
],
include_package_data = True,
zip_safe = False,
Modified: zope.app.form/trunk/src/zope/app/form/browser/form.txt
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/form.txt 2009-10-08 05:18:53 UTC (rev 104905)
+++ zope.app.form/trunk/src/zope/app/form/browser/form.txt 2009-10-08 06:06:50 UTC (rev 104906)
@@ -108,10 +108,6 @@
>>> import zope.app.form.browser
>>> context = xmlconfig.file('meta.zcml', zope.app.form.browser, context)
- >>> import zope.app.publisher.browser
- >>> context = xmlconfig.file('meta.zcml', zope.app.publisher.browser,
- ... context)
-
Before we run the directive, make sure that no view exists:
>>> class IAnything(zope.interface.Interface):
Modified: zope.app.form/trunk/src/zope/app/form/browser/metaconfigure.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/metaconfigure.py 2009-10-08 05:18:53 UTC (rev 104905)
+++ zope.app.form/trunk/src/zope/app/form/browser/metaconfigure.py 2009-10-08 06:06:50 UTC (rev 104906)
@@ -28,7 +28,7 @@
from zope.schema import getFieldNamesInOrder
from zope.publisher.interfaces.browser import IBrowserRequest
from zope.publisher.interfaces.browser import IDefaultBrowserLayer
-from zope.app.publisher.browser.menumeta import menuItemDirective
+from zope.browsermenu.metaconfigure import menuItemDirective
from zope.app.form import CustomWidgetFactory
from zope.app.form.browser.i18n import _
Modified: zope.app.form/trunk/src/zope/app/form/browser/metadirectives.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/metadirectives.py 2009-10-08 05:18:53 UTC (rev 104905)
+++ zope.app.form/trunk/src/zope/app/form/browser/metadirectives.py 2009-10-08 06:06:50 UTC (rev 104906)
@@ -23,7 +23,7 @@
from zope.configuration.fields import MessageID
from zope.schema import Text, TextLine, Id
from zope.security.zcml import Permission
-from zope.app.publisher.browser.fields import MenuField
+from zope.browsermenu.field import MenuField
class ICommonInformation(Interface):
"""
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-10-08 05:18:53 UTC (rev 104905)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/registerWidgets.zcml 2009-10-08 06:06:50 UTC (rev 104906)
@@ -3,7 +3,7 @@
i18n_domain="zope">
<include package="zope.app.component" file="meta.zcml" />
- <include package="zope.app.publisher.browser" file="meta.zcml" />
+ <include package="zope.browserpage" file="meta.zcml" />
<include package="zope.app.form.browser" file="configure.zcml" />
-</configure>
\ No newline at end of file
+</configure>
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-10-08 05:18:53 UTC (rev 104905)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_directives.py 2009-10-08 06:06:50 UTC (rev 104906)
@@ -30,15 +30,11 @@
import zope.app.component
import zope.app.form.browser
-import zope.app.publisher.browser
+import zope.browsermenu
from zope.app.form.browser import TextWidget
from zope.app.testing.placelesssetup import PlacelessSetup
from zope.app.form.tests import utils
-tests_path = os.path.join(
- os.path.dirname(zope.app.publisher.browser.__file__),
- 'tests')
-
template = """<configure
xmlns='http://namespaces.zope.org/zope'
xmlns:browser='http://namespaces.zope.org/browser'
@@ -80,7 +76,7 @@
super(Test, self).setUp()
XMLConfig('meta.zcml', zope.app.component)()
XMLConfig('meta.zcml', zope.app.form.browser)()
- XMLConfig('meta.zcml', zope.app.publisher.browser)()
+ XMLConfig('meta.zcml', zope.browsermenu)()
from zope.app.testing import ztapi
from zope.traversing.adapters import DefaultTraversable
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-10-08 05:18:53 UTC (rev 104905)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/widgetDirectives.zcml 2009-10-08 06:06:50 UTC (rev 104906)
@@ -3,7 +3,6 @@
i18n_domain="zope">
<include package="zope.app.component" file="meta.zcml" />
- <include package="zope.app.publisher" file="meta.zcml" />
<include package="zope.app.security" file="meta.zcml" />
<include package="zope.app.form.browser" file="meta.zcml" />
More information about the checkins
mailing list