[Checkins] SVN: Products.GenericSetup/trunk/ - Removed ``five.formlib`` dependency. ``zope.formlib`` is now used directly.

[Yvo Schubbe]

Log message for revision 120619:
  - Removed ``five.formlib`` dependency. ``zope.formlib`` is now used directly.

Changed:
  UU  Products.GenericSetup/trunk/Products/GenericSetup/browser/components.py
  U   Products.GenericSetup/trunk/Products/GenericSetup/configure.zcml
  U   Products.GenericSetup/trunk/Products/GenericSetup/meta.zcml
  U   Products.GenericSetup/trunk/docs/CHANGES.rst
  UU  Products.GenericSetup/trunk/setup.py

-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/browser/components.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/browser/components.py	2011-03-01 07:56:07 UTC (rev 120618)
+++ Products.GenericSetup/trunk/Products/GenericSetup/browser/components.py	2011-03-01 08:38:56 UTC (rev 120619)
@@ -11,14 +11,15 @@
 #
 ##############################################################################
 """Components setup view.
-
-$Id$
 """
 
+import os.path
+
+import zope.formlib
+from Products.Five.browser.decode import processInputs
+from Products.Five.browser.decode import setPageEncoding
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from Products.Five.component.interfaces import IObjectManagerSite
-
-from five.formlib.formbase import PageEditForm
 from zope.component import adapts
 from zope.component import getMultiAdapter
 from zope.formlib import form
@@ -29,7 +30,10 @@
 from Products.GenericSetup.context import SetupEnviron
 from Products.GenericSetup.interfaces import IBody
 
+_FORMLIB_DIR = os.path.dirname(zope.formlib.__file__)
+_PAGEFORM_PATH = os.path.join(_FORMLIB_DIR, 'pageform.pt')
 
+
 class IComponentsSetupSchema(Interface):
 
     """Schema for components setup views.
@@ -58,15 +62,22 @@
     body = property(_getBody, _setBody)
 
 
-class ComponentsSetupView(PageEditForm):
+class ComponentsSetupView(form.PageEditForm):
 
     """Components setup view for IObjectManagerSite.
     """
 
+    template = ViewPageTemplateFile(_PAGEFORM_PATH)
+
     label = u'Component Registry: XML Configuration'
 
     form_fields = form.FormFields(IComponentsSetupSchema)
 
+    def update(self):
+        processInputs(self.request)
+        setPageEncoding(self.request)
+        super(ComponentsSetupView, self).update()
+
     def setUpWidgets(self, ignore_request=False):
         super(ComponentsSetupView,
               self).setUpWidgets(ignore_request=ignore_request)
@@ -78,7 +89,7 @@
     """Components setup ZMI tab for IObjectManagerSite.
     """
 
-    base_template = PageEditForm.template
+    base_template = ComponentsSetupView.template
 
     template = ViewPageTemplateFile('components.pt')
 


Property changes on: Products.GenericSetup/trunk/Products/GenericSetup/browser/components.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.GenericSetup/trunk/Products/GenericSetup/configure.zcml
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/configure.zcml	2011-03-01 07:56:07 UTC (rev 120618)
+++ Products.GenericSetup/trunk/Products/GenericSetup/configure.zcml	2011-03-01 08:38:56 UTC (rev 120619)
@@ -3,7 +3,7 @@
     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
     i18n_domain="genericsetup">
 
-  <include package="five.formlib" />
+  <include package="zope.formlib" />
 
   <include package=".browser"/>
 

Modified: Products.GenericSetup/trunk/Products/GenericSetup/meta.zcml
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/meta.zcml	2011-03-01 07:56:07 UTC (rev 120618)
+++ Products.GenericSetup/trunk/Products/GenericSetup/meta.zcml	2011-03-01 08:38:56 UTC (rev 120619)
@@ -2,8 +2,6 @@
     xmlns="http://namespaces.zope.org/zope"
     xmlns:meta="http://namespaces.zope.org/meta">
 
-  <include package="five.formlib" file="meta.zcml" />
-
   <meta:directives namespace="http://namespaces.zope.org/genericsetup">
 
     <meta:directive
@@ -55,7 +53,6 @@
          schema=".zcml.IUpgradeDependsSubDirective"
          />
     </meta:complexDirective>
-        
 
   </meta:directives>
 

Modified: Products.GenericSetup/trunk/docs/CHANGES.rst
===================================================================
--- Products.GenericSetup/trunk/docs/CHANGES.rst	2011-03-01 07:56:07 UTC (rev 120618)
+++ Products.GenericSetup/trunk/docs/CHANGES.rst	2011-03-01 08:38:56 UTC (rev 120619)
@@ -4,6 +4,8 @@
 1.6.3 (unreleased)
 ------------------
 
+- Removed ``five.formlib`` dependency. ``zope.formlib`` is now used directly.
+
 - Import form: Sort the list of extension profiles alphabetically by title.
 
 - Property import/export: Fixed two 'date' property issues.

Modified: Products.GenericSetup/trunk/setup.py
===================================================================
--- Products.GenericSetup/trunk/setup.py	2011-03-01 07:56:07 UTC (rev 120618)
+++ Products.GenericSetup/trunk/setup.py	2011-03-01 08:38:56 UTC (rev 120619)
@@ -51,10 +51,10 @@
       install_requires=[
           'setuptools',
           'Zope2 >= 2.12.3',
-          'five.formlib >= 1.0.2',
           'five.localsitemanager',
 #          'Products.MailHost', # BBB: disabled for Zope 2.12
 #          'Products.PythonScripts', # BBB: disabled for Zope 2.12
+          'zope.formlib',
           ],
       tests_require=[
           'zope.testrunner',


Property changes on: Products.GenericSetup/trunk/setup.py
___________________________________________________________________
Deleted: svn:keywords
   - Id