[Checkins] SVN: z3c.configurator/trunk/ Moved browser dependencies to 'zmi' extras

[Nikolay Kim]

Log message for revision 107144:
  Moved browser dependencies to 'zmi' extras

Changed:
  U   z3c.configurator/trunk/CHANGES.txt
  U   z3c.configurator/trunk/setup.py
  U   z3c.configurator/trunk/src/z3c/configurator/README.txt
  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/views.py
  U   z3c.configurator/trunk/src/z3c/configurator/configure.zcml
  D   z3c.configurator/trunk/src/z3c/configurator/z3c.configurator-configure.zcml

-=-
Modified: z3c.configurator/trunk/CHANGES.txt
===================================================================
--- z3c.configurator/trunk/CHANGES.txt	2009-12-27 06:55:16 UTC (rev 107143)
+++ z3c.configurator/trunk/CHANGES.txt	2009-12-27 08:49:47 UTC (rev 107144)
@@ -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)

Modified: z3c.configurator/trunk/setup.py
===================================================================
--- z3c.configurator/trunk/setup.py	2009-12-27 06:55:16 UTC (rev 107143)
+++ z3c.configurator/trunk/setup.py	2009-12-27 08:49:47 UTC (rev 107144)
@@ -65,6 +65,10 @@
             'zope.app.testing',
             'zope.app.zcmlfiles',
             ],
+        zmi = [
+            'zope.browserpage',
+            'zope.formlib',
+            ],
         ),
     install_requires = [
         'setuptools',

Modified: z3c.configurator/trunk/src/z3c/configurator/README.txt
===================================================================
--- z3c.configurator/trunk/src/z3c/configurator/README.txt	2009-12-27 06:55:16 UTC (rev 107143)
+++ z3c.configurator/trunk/src/z3c/configurator/README.txt	2009-12-27 08:49:47 UTC (rev 107144)
@@ -117,14 +117,15 @@
   >>> 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
 ---------------
 

Modified: z3c.configurator/trunk/src/z3c/configurator/browser/configure.zcml
===================================================================
--- z3c.configurator/trunk/src/z3c/configurator/browser/configure.zcml	2009-12-27 06:55:16 UTC (rev 107143)
+++ z3c.configurator/trunk/src/z3c/configurator/browser/configure.zcml	2009-12-27 08:49:47 UTC (rev 107144)
@@ -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>

Modified: z3c.configurator/trunk/src/z3c/configurator/browser/ftesting.zcml
===================================================================
--- z3c.configurator/trunk/src/z3c/configurator/browser/ftesting.zcml	2009-12-27 06:55:16 UTC (rev 107143)
+++ z3c.configurator/trunk/src/z3c/configurator/browser/ftesting.zcml	2009-12-27 08:49:47 UTC (rev 107144)
@@ -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"

Modified: z3c.configurator/trunk/src/z3c/configurator/browser/views.py
===================================================================
--- z3c.configurator/trunk/src/z3c/configurator/browser/views.py	2009-12-27 06:55:16 UTC (rev 107143)
+++ z3c.configurator/trunk/src/z3c/configurator/browser/views.py	2009-12-27 08:49:47 UTC (rev 107144)
@@ -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

Modified: z3c.configurator/trunk/src/z3c/configurator/configure.zcml
===================================================================
--- z3c.configurator/trunk/src/z3c/configurator/configure.zcml	2009-12-27 06:55:16 UTC (rev 107143)
+++ z3c.configurator/trunk/src/z3c/configurator/configure.zcml	2009-12-27 08:49:47 UTC (rev 107144)
@@ -11,7 +11,5 @@
      component=".vocabulary.pluginNamesVocabulary"
      provides="zope.schema.interfaces.IVocabularyFactory"
      name="Configurator Plugin Names"/>
-  
-  <include package=".browser"/>
 
 </configure>

Deleted: z3c.configurator/trunk/src/z3c/configurator/z3c.configurator-configure.zcml
===================================================================
--- z3c.configurator/trunk/src/z3c/configurator/z3c.configurator-configure.zcml	2009-12-27 06:55:16 UTC (rev 107143)
+++ z3c.configurator/trunk/src/z3c/configurator/z3c.configurator-configure.zcml	2009-12-27 08:49:47 UTC (rev 107144)
@@ -1 +0,0 @@
-<include package="z3c.configurator"/>
\ No newline at end of file