[Checkins] SVN: z3c.configurator/trunk/ - Made registration of browser views conditional
Nikolay Kim
fafhrd91 at gmail.com
Sat Dec 19 20:09:23 EST 2009
Log message for revision 106790:
- Made registration of browser views conditional
- Move packages required for testing to 'test' extras
- Remove old zpkg-related SETUP.cfg file.
- Copyright "Zope Foundation and Contributors"
Changed:
U z3c.configurator/trunk/CHANGES.txt
U z3c.configurator/trunk/bootstrap.py
U z3c.configurator/trunk/importchecker.py
U z3c.configurator/trunk/setup.py
D z3c.configurator/trunk/src/z3c/configurator/SETUP.cfg
U z3c.configurator/trunk/src/z3c/configurator/browser/configure.zcml
U z3c.configurator/trunk/src/z3c/configurator/browser/ftesting.zcml
U z3c.configurator/trunk/src/z3c/configurator/browser/testing.py
U z3c.configurator/trunk/src/z3c/configurator/browser/views.py
U z3c.configurator/trunk/src/z3c/configurator/configurator.py
U z3c.configurator/trunk/src/z3c/configurator/configure.zcml
U z3c.configurator/trunk/src/z3c/configurator/i18n.py
U z3c.configurator/trunk/src/z3c/configurator/interfaces.py
U z3c.configurator/trunk/src/z3c/configurator/tests.py
U z3c.configurator/trunk/src/z3c/configurator/vocabulary.py
-=-
Modified: z3c.configurator/trunk/CHANGES.txt
===================================================================
--- z3c.configurator/trunk/CHANGES.txt 2009-12-20 01:08:00 UTC (rev 106789)
+++ z3c.configurator/trunk/CHANGES.txt 2009-12-20 01:09:23 UTC (rev 106790)
@@ -2,13 +2,19 @@
CHANGES
=======
-Version 1.1.3 (unreleased)
+Version 1.2.0 (12-19-2009)
--------------------------
--
+- Made registration of browser views conditional
+- Move packages required for testing to 'test' extras
-Version 1.1.2 (2009-01-04)
+- Remove old zpkg-related SETUP.cfg file.
+
+- Copyright "Zope Foundation and Contributors"
+
+
+Version 1.1.2 (01-04-2009)
--------------------------
- Added possibility to apply only specific named plugins in configure.
Modified: z3c.configurator/trunk/bootstrap.py
===================================================================
--- z3c.configurator/trunk/bootstrap.py 2009-12-20 01:08:00 UTC (rev 106789)
+++ z3c.configurator/trunk/bootstrap.py 2009-12-20 01:09:23 UTC (rev 106790)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2006 Zope Corporation and Contributors.
+# Copyright (c) 2006 Zope Foundation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: z3c.configurator/trunk/importchecker.py
===================================================================
--- z3c.configurator/trunk/importchecker.py 2009-12-20 01:08:00 UTC (rev 106789)
+++ z3c.configurator/trunk/importchecker.py 2009-12-20 01:09:23 UTC (rev 106790)
@@ -1,7 +1,7 @@
#!/usr/bin/env python2.4
##############################################################################
#
-# Copyright (c) 2003 Zope Corporation and Contributors.
+# Copyright (c) 2003 Zope Foundation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -351,4 +351,3 @@
if __name__ == '__main__':
main()
-
Modified: z3c.configurator/trunk/setup.py
===================================================================
--- z3c.configurator/trunk/setup.py 2009-12-20 01:08:00 UTC (rev 106789)
+++ z3c.configurator/trunk/setup.py 2009-12-20 01:09:23 UTC (rev 106790)
@@ -23,7 +23,7 @@
setup(
name = 'z3c.configurator',
- version='1.1.3dev',
+ version='1.2.0dev',
author = "Zope Community",
author_email = "zope-dev at zope.org",
description = "Dynamic configuration",
@@ -55,27 +55,23 @@
namespace_packages = ['z3c'],
extras_require = dict(
test = [
+ 'zope.annotation',
+ 'zope.dublincore',
+ 'zope.formlib',
+ 'zope.securitypolicy',
+ 'zope.testbrowser',
+ 'zope.testing',
+ 'zope.app.pagetemplate',
'zope.app.testing',
+ 'zope.app.zcmlfiles',
],
),
install_requires = [
- 'setuptools',
- 'zope.annotation',
- 'zope.app.pagetemplate',
- 'zope.app.securitypolicy',
- 'zope.app.testing',
- 'zope.app.zcmlfiles',
- 'zope.cachedescriptors',
- 'zope.component',
- 'zope.dublincore',
- 'zope.formlib',
- 'zope.i18nmessageid',
- 'zope.interface',
- 'zope.schema',
- 'zope.testbrowser',
- 'zope.testing',
- ],
- dependency_links = ['http://download.zope.org/distribution'],
+ 'setuptools',
+ 'zope.component',
+ 'zope.i18nmessageid',
+ 'zope.interface',
+ 'zope.schema',
+ ],
zip_safe=False,
)
-
Deleted: z3c.configurator/trunk/src/z3c/configurator/SETUP.cfg
===================================================================
--- z3c.configurator/trunk/src/z3c/configurator/SETUP.cfg 2009-12-20 01:08:00 UTC (rev 106789)
+++ z3c.configurator/trunk/src/z3c/configurator/SETUP.cfg 2009-12-20 01:09:23 UTC (rev 106790)
@@ -1,3 +0,0 @@
-<data-files zopeskel/etc/package-includes>
- z3c.configurator-*.zcml
-</data-files>
Modified: z3c.configurator/trunk/src/z3c/configurator/browser/configure.zcml
===================================================================
--- z3c.configurator/trunk/src/z3c/configurator/browser/configure.zcml 2009-12-20 01:08:00 UTC (rev 106789)
+++ z3c.configurator/trunk/src/z3c/configurator/browser/configure.zcml 2009-12-20 01:09:23 UTC (rev 106790)
@@ -1,7 +1,9 @@
<configure
- xmlns:zope="http://namespaces.zope.org/zope"
- xmlns="http://namespaces.zope.org/browser"
- i18n_domain="z3c.configurator">
+ xmlns:zope="http://namespaces.zope.org/zope"
+ xmlns="http://namespaces.zope.org/browser"
+ xmlns:zcml="http://namespaces.zope.org/zcml"
+ zcml:condition="installed zope.formlib"
+ i18n_domain="z3c.configurator">
<page
for="*"
@@ -11,4 +13,4 @@
class=".views.ConfigureForm"
menu="zmi_views"/>
-</configure>
\ No newline at end of file
+</configure>
Modified: z3c.configurator/trunk/src/z3c/configurator/browser/ftesting.zcml
===================================================================
--- z3c.configurator/trunk/src/z3c/configurator/browser/ftesting.zcml 2009-12-20 01:08:00 UTC (rev 106789)
+++ z3c.configurator/trunk/src/z3c/configurator/browser/ftesting.zcml 2009-12-20 01:09:23 UTC (rev 106790)
@@ -6,59 +6,54 @@
<include package="zope.app.zcmlfiles" />
<include package="zope.securitypolicy" file="meta.zcml" />
+ <include package="zope.securitypolicy" />
<include package="zope.app.authentication" />
<securityPolicy
- component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+ component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
- <include package="zope.app.securitypolicy" />
-
<role id="zope.Anonymous" title="Everybody"
description="All users have this role implicitly" />
<role id="zope.Manager" title="Site Manager" />
-
<principal
- id="zope.manager"
- title="Administrator"
- login="mgr"
- password="mgrpw" />
+ id="zope.manager"
+ title="Administrator"
+ login="mgr"
+ password="mgrpw" />
+
<grant
- role="zope.Manager"
- principal="zope.manager"
- />
+ role="zope.Manager"
+ principal="zope.manager" />
<unauthenticatedPrincipal
- id="zope.anybody"
- title="Unauthenticated User" />
+ id="zope.anybody"
+ title="Unauthenticated User" />
<unauthenticatedGroup
- id="zope.Anybody"
- title="Unauthenticated Users"
- />
+ id="zope.Anybody"
+ title="Unauthenticated Users" />
<authenticatedGroup
- id="zope.Authenticated"
- title="Authenticated Users"
- />
+ id="zope.Authenticated"
+ title="Authenticated Users" />
<everybodyGroup
- id="zope.Everybody"
- title="All Users"
- />
+ id="zope.Everybody"
+ title="All Users" />
<include package="zope.app.form.browser" />
<include package="zope.formlib" />
<include package="z3c.configurator"/>
<adapter
- name="z3c.configurator.testing.settitle"
- factory="z3c.configurator.browser.testing.SetTitle"/>
-
- <adapter
- name="z3c.configurator.testing.setdescription"
- factory="z3c.configurator.browser.testing.SetDescription"/>
+ name="z3c.configurator.testing.settitle"
+ factory="z3c.configurator.browser.testing.SetTitle"/>
-
+ <adapter
+ name="z3c.configurator.testing.setdescription"
+ factory="z3c.configurator.browser.testing.SetDescription"/>
+
<grantAll role="zope.Manager" />
+
</configure>
Modified: z3c.configurator/trunk/src/z3c/configurator/browser/testing.py
===================================================================
--- z3c.configurator/trunk/src/z3c/configurator/browser/testing.py 2009-12-20 01:08:00 UTC (rev 106789)
+++ z3c.configurator/trunk/src/z3c/configurator/browser/testing.py 2009-12-20 01:09:23 UTC (rev 106790)
@@ -15,7 +15,7 @@
"""makes an object implement IFoo"""
component.adapts(IAttributeAnnotatable)
schema = ISingleArg
-
+
def __call__(self, data):
dc = IZopeDublinCore(self.context)
dc.title = data.get('arg')
@@ -24,9 +24,7 @@
component.adapts(IAttributeAnnotatable)
schema = ISingleArg
-
+
def __call__(self, data):
dc = IZopeDublinCore(self.context)
dc.description = data.get('arg')
-
-
Modified: z3c.configurator/trunk/src/z3c/configurator/browser/views.py
===================================================================
--- z3c.configurator/trunk/src/z3c/configurator/browser/views.py 2009-12-20 01:08:00 UTC (rev 106789)
+++ z3c.configurator/trunk/src/z3c/configurator/browser/views.py 2009-12-20 01:09:23 UTC (rev 106790)
@@ -3,9 +3,9 @@
from zope import formlib
from zope.formlib import form
+from zope.app.pagetemplate import namedtemplate
from zope.app.pagetemplate import ViewPageTemplateFile
-from zope.cachedescriptors.property import Lazy
-from z3c.configurator import interfaces
+from z3c.configurator import interfaces
from z3c.configurator.i18n import _
from z3c.configurator import configurator
@@ -26,6 +26,7 @@
configurator.configure(self.context, names=[pluginName])
self.status = _('Configuration applied')
+
class IGenerateSchema(interface.Interface):
"""Schema for the minimal generator parameters"""
@@ -43,7 +44,7 @@
base_template = form.EditForm.template
template = ViewPageTemplateFile('configure.pt')
subforms = []
-
+
form_fields = form.Fields(
schema.List(__name__=u'pluginNames',
title=u'Plugin Names',
@@ -52,10 +53,10 @@
title=_(u'Plugin Name'),
vocabulary="Configurator Plugin Names")
))
-
+
workDone = False
- @Lazy
+ @property
def _pluginNames(self):
names = self.request.form.get(self.prefix + '.pluginNames')
if names and not type(names) is type([]):
@@ -87,7 +88,7 @@
self.setUpWidgets(ignore_request=False)
result = self.template()
return result
-
+
def _pluginsSelected(self, action):
return not not self.request.form.get(self.prefix + '.pluginNames')
@@ -102,7 +103,7 @@
subform.prefix,
formData)
configuratorData[subform.prefix] = formData
-
+
configurator.configure(self.context,
configuratorData,
names=self._pluginNames,
@@ -113,7 +114,7 @@
class PluginSchemaForm(form.AddForm):
"""An editor for a single schema based plugin"""
interface.implements(formlib.interfaces.ISubPageForm)
- template = formlib.namedtemplate.NamedTemplate('default')
+ template = namedtemplate.NamedTemplate('default')
actions = []
def __init__(self, context, request, plugin=None,
@@ -122,4 +123,3 @@
self.schema = schema
self.prefix = prefix
super(PluginSchemaForm, self).__init__(context, request)
-
Modified: z3c.configurator/trunk/src/z3c/configurator/configurator.py
===================================================================
--- z3c.configurator/trunk/src/z3c/configurator/configurator.py 2009-12-20 01:08:00 UTC (rev 106789)
+++ z3c.configurator/trunk/src/z3c/configurator/configurator.py 2009-12-20 01:09:23 UTC (rev 106790)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2005 Zope Corporation and Contributors.
+# Copyright (c) 2005 Zope Foundation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -48,7 +48,7 @@
# get all names we have available
names = getAdapterFactories(component,
specific=True).keys()
-
+
# we need this in order to get dependencies from plugins which are
# not available in the unconfigured component because the provided
# interfaces may change during execution
Modified: z3c.configurator/trunk/src/z3c/configurator/configure.zcml
===================================================================
--- z3c.configurator/trunk/src/z3c/configurator/configure.zcml 2009-12-20 01:08:00 UTC (rev 106789)
+++ z3c.configurator/trunk/src/z3c/configurator/configure.zcml 2009-12-20 01:09:23 UTC (rev 106790)
@@ -1,17 +1,17 @@
<configure
- xmlns="http://namespaces.zope.org/zope"
- i18n_domain="z3c.configurator">
+ xmlns="http://namespaces.zope.org/zope"
+ i18n_domain="z3c.configurator">
<permission
- id="z3c.configurator.ManageConfigurations"
- title="Manage Configurations"
- />
+ id="z3c.configurator.ManageConfigurations"
+ title="Manage Configurations"
+ />
<utility
- component=".vocabulary.pluginNamesVocabulary"
- provides="zope.schema.interfaces.IVocabularyFactory"
- name="Configurator Plugin Names"/>
+ component=".vocabulary.pluginNamesVocabulary"
+ provides="zope.schema.interfaces.IVocabularyFactory"
+ name="Configurator Plugin Names"/>
<include package=".browser"/>
-
-</configure>
\ No newline at end of file
+
+</configure>
Modified: z3c.configurator/trunk/src/z3c/configurator/i18n.py
===================================================================
--- z3c.configurator/trunk/src/z3c/configurator/i18n.py 2009-12-20 01:08:00 UTC (rev 106789)
+++ z3c.configurator/trunk/src/z3c/configurator/i18n.py 2009-12-20 01:09:23 UTC (rev 106790)
@@ -7,4 +7,3 @@
import zope.i18nmessageid
_ = zope.i18nmessageid.MessageFactory('z3c.configurator')
-
Modified: z3c.configurator/trunk/src/z3c/configurator/interfaces.py
===================================================================
--- z3c.configurator/trunk/src/z3c/configurator/interfaces.py 2009-12-20 01:08:00 UTC (rev 106789)
+++ z3c.configurator/trunk/src/z3c/configurator/interfaces.py 2009-12-20 01:09:23 UTC (rev 106790)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2005 Zope Corporation and Contributors.
+# Copyright (c) 2005 Zope Foundation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -43,6 +43,7 @@
then raise a ``DataMissingError`` error.
"""
+
class ISchemaConfigurationPlugin(IConfigurationPlugin):
"""A configuration plugin that provides a data schema."""
Modified: z3c.configurator/trunk/src/z3c/configurator/tests.py
===================================================================
--- z3c.configurator/trunk/src/z3c/configurator/tests.py 2009-12-20 01:08:00 UTC (rev 106789)
+++ z3c.configurator/trunk/src/z3c/configurator/tests.py 2009-12-20 01:09:23 UTC (rev 106790)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2005 Zope Corporation and Contributors.
+# Copyright (c) 2005 Zope Foundation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -18,9 +18,7 @@
__docformat__ = "reStructuredText"
__docformat__ = 'restructuredtext'
-import unittest
-from zope.testing import doctest
-from zope.testing.doctestunit import DocFileSuite
+import unittest, doctest
from zope.app.testing import setup
def setUp(test):
@@ -32,9 +30,9 @@
def test_suite():
return unittest.TestSuite((
- DocFileSuite('README.txt',
- setUp=setUp, tearDown=tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+ doctest.DocFileSuite('README.txt',
+ setUp=setUp, tearDown=tearDown,
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
),
))
Modified: z3c.configurator/trunk/src/z3c/configurator/vocabulary.py
===================================================================
--- z3c.configurator/trunk/src/z3c/configurator/vocabulary.py 2009-12-20 01:08:00 UTC (rev 106789)
+++ z3c.configurator/trunk/src/z3c/configurator/vocabulary.py 2009-12-20 01:09:23 UTC (rev 106790)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2005 Zope Corporation and Contributors.
+# Copyright (c) 2005 Zope Foundation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
More information about the checkins
mailing list