Moved browser dependencies to 'zmi' extras

zopefoundation · Dec 27, 2009 · b43d20c · b43d20c
1 parent 7a475c0
commit b43d20c
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -2,10 +2,10 @@
 CHANGES
 =======
 
-Version 1.2.1 (Unreleased)
+Version 1.2.1 (2009-12-27)
 --------------------------
 
-- ...
+- Moved browser dependencies to 'zmi' extras
 
 
 Version 1.2.0 (2009-12-19)

diff --git a/setup.py b/setup.py
@@ -65,6 +65,10 @@ def read(*rnames):
             'zope.app.testing',
             'zope.app.zcmlfiles',
             ],
+        zmi = [
+            'zope.browserpage',
+            'zope.formlib',
+            ],
         ),
     install_requires = [
         'setuptools',

diff --git a/src/z3c/configurator/README.txt b/src/z3c/configurator/README.txt
@@ -117,13 +117,14 @@ The value must exist and be valid:
   >>> configurator.configure(something, {'foo': u'my value'})
   Traceback (most recent call last):
   ...
-  RequiredMissing
+  RequiredMissing: bar
 
   >>> something = Something()
   >>> configurator.configure(something, {'foo': u'my value', 'bar': 1})
   Traceback (most recent call last):
   ...
-  WrongType: (1, <type 'unicode'>)
+  WrongType: (1, <type 'unicode'>, 'bar')
+
 
 Data Namespaces
 ---------------

diff --git a/src/z3c/configurator/browser/configure.zcml b/src/z3c/configurator/browser/configure.zcml
@@ -1,8 +1,6 @@
 <configure
    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
@@ -12,5 +10,5 @@
       title="Configurators"
       class=".views.ConfigureForm"
       menu="zmi_views"/>
-  
+
 </configure>
diff --git a/src/z3c/configurator/browser/ftesting.zcml b/src/z3c/configurator/browser/ftesting.zcml
@@ -45,6 +45,7 @@
   <include package="zope.app.form.browser" />
   <include package="zope.formlib" />
   <include package="z3c.configurator"/>
+  <include package="z3c.configurator.browser" />
 
   <adapter
      name="z3c.configurator.testing.settitle"

diff --git a/src/z3c/configurator/browser/views.py b/src/z3c/configurator/browser/views.py
@@ -3,8 +3,8 @@
 
 from zope import formlib
 from zope.formlib import form
-from zope.app.pagetemplate import namedtemplate
-from zope.app.pagetemplate import ViewPageTemplateFile
+from zope.browserpage import namedtemplate
+from zope.browserpage import ViewPageTemplateFile
 from z3c.configurator import interfaces
 from z3c.configurator.i18n import _
 from z3c.configurator import configurator

diff --git a/src/z3c/configurator/configure.zcml b/src/z3c/configurator/configure.zcml
@@ -11,7 +11,5 @@
      component=".vocabulary.pluginNamesVocabulary"
      provides="zope.schema.interfaces.IVocabularyFactory"
      name="Configurator Plugin Names"/>
-
-  <include package=".browser"/>
 
 </configure>
diff --git a/src/z3c/configurator/z3c.configurator-configure.zcml b/src/z3c/configurator/z3c.configurator-configure.zcml