Finished the move of five.formlib to an extra package and removed it from Zope...

Finished the move of five.formlib to an extra package and removed it from Zope 2 itself. Upgrade notes have been added to the news section of the release notes.

ZOPE_APP_DEPENDENCIES.rst

@@ -121,8 +121,8 @@ Zope2 depends on some packages only via transitive test dependencies.
 - [X] zope.copypastemove
       * zope.container
 
-- [ ] zope.datetime
-      o zope.app.form
+- [X] zope.datetime
+      * zope.app.form
       * zope.dublincore
 
 - [X] zope.dublincore
@@ -135,7 +135,7 @@ Questionable dependencies
 - [X] zope.authentication (seems to be used for some ILogin related stuff)
       * zope.publisher
 
-- [ ] zope.broken (this is really just one interface, merge into ZODB3!)
+- [ ] zope.broken (this is merged into ZODB3 starting with the unreleased 3.10)
       o zope.container
 
 - [X] zope.cachedescriptors
@@ -166,7 +166,6 @@ of how "interactions" work with the zope.publisher are also pretty muddy.
 
 - [ ] zope.proxy
       o zope.annotation
-      o zope.app.form
       o zope.browserresource
       o zope.component
       o zope.deferredimport
@@ -177,14 +176,12 @@ of how "interactions" work with the zope.publisher are also pretty muddy.
       o zope.traversing
 
 - [ ] zope.security
-      o zope.app.form
       o zope.authentication
       o zope.browsermenu
       o zope.browserpage
       o zope.browserresource
       o zope.component
       o zope.container
-      o zope.formlib
       o zope.pagetemplate
       o zope.ptresource
       o zope.publisher

buildout.cfg

@@ -45,7 +45,6 @@ eggs =
     ExtensionClass
     Persistence
     RestrictedPython
-    five.formlib
     tempstorage
     zope.browser
     zope.browsermenu

doc/CHANGES.rst

@@ -11,6 +11,10 @@ Trunk (unreleased)
 Restructuring
 +++++++++++++
 
+- Finished the move of five.formlib to an extra package and removed it from
+  Zope 2 itself. Upgrade notes have been added to the news section of the
+  release notes.
+
 - Moved Products.Sessions APIs from ``SessionInterfaces`` to ``interfaces``,
   leaving behind the old module / names for backward compatibility.
 

doc/WHATSNEW.rst

@@ -8,7 +8,23 @@ You can have a look at the `detailed change log <CHANGES.html>`_ to learn
 about all minor new features and bugs being solved in this release.
 
 
-News!
------
+Optional Formlib support
+------------------------
 
-No major new features are available in this version yet.
+Zope 2 made a number of frameworks available through its integration layer
+Products.Five. Among these has been direct support for an automated form
+generation framework called zope.formlib with its accompanying widget library
+zope.app.form.
+
+This form generation framework has seen only minor adoption throughout the Zope
+community and more popular alternatives like z3c.form exist. To reflect this
+status Zope 2 no longer directly contains formlib support.
+
+If you rely on formlib, you need to add a dependency to the new five.formlib
+distribution and change all related imports pointing to Products.Five.form or
+Products.Five.formlib to point to the new package instead.
+
+In order to ease the transition, five.formlib has been backported to the 2.12
+release series. Starting in 2.12.3 you can already use the new five.formlib
+package, but backwards compatibility imports are left in place in Products.Five.
+This allows you to easily adopt your packages to work with both 2.12 and 2.13.

setup.py

@@ -94,7 +94,6 @@ setup(name='Zope2',
       'ZConfig',
       'ZODB3',
       'docutils',
-      'five.formlib',
       'pytz',
       'setuptools',
       'tempstorage',

src/Products/Five/browser/adding.py

@@ -90,8 +90,7 @@ class Adding(BrowserView):
     def nextURL(self):
         """See zope.browser.interfaces.IAdding"""
         # XXX this is definitely not right for all or even most uses
-        # of Five, but can be overridden by an AddView subclass, using
-        # the class attribute of a zcml:addform directive
+        # of Five, but can be overridden by an AddView subclass
         return absoluteURL(self.context, self.request) + '/manage_main'
 
     # set in BrowserView.__init__

src/Products/Five/configure.zcml

@@ -10,8 +10,6 @@
 
   <include package=".component" />
   <include package=".browser" />
-  <include package=".form" />
-  <include package=".formlib" />
   <include package=".skin" />
   <include package=".utilities" />
   <include package=".viewlet" />

src/Products/Five/doc/directives.txt

@@ -66,16 +66,6 @@ defaultView
 Declare the name of the view that should be used for the default when viewing
 the object; i.e. when the object is traversed to without a view.
 
-editform
---------
-
-Create an edit form based on a schema.
-
-addform
---------
-
-Create an add form based on a schema.
-
 menu
 ----
 

src/Products/Five/form/__init__.py

-from zope.deferredimport import deprecated
-
-deprecated("Please import from five.formlib",
-    AddView = 'five.formlib:AddView',
-    EditView = 'five.formlib:EditView',
-)

src/Products/Five/form/configure.zcml

-<configure xmlns="http://namespaces.zope.org/zope">
-
-  <include package="five.formlib" />
-
-</configure>
\ No newline at end of file

src/Products/Five/form/macros.py

-from zope.deferredimport import deprecated
-
-deprecated("Please import from five.formlib.macros",
-    FormMacros = 'five.formlib.macros:FormMacros',
-)

src/Products/Five/form/meta.zcml

-<configure xmlns="http://namespaces.zope.org/zope">
-
-  <include package="five.formlib" file="meta.zcml" />
-
-</configure>

src/Products/Five/form/metaconfigure.py

-from zope.deferredimport import deprecated
-
-deprecated("Please import from five.formlib.metaconfigure",
-    EditViewFactory = 'five.formlib.metaconfigure:EditViewFactory',
-    FiveFormDirective = 'five.formlib.metaconfigure:FiveFormDirective',
-    EditFormDirective = 'five.formlib.metaconfigure:EditFormDirective',
-    AddViewFactory = 'five.formlib.metaconfigure:AddViewFactory',
-    AddFormDirective = 'five.formlib.metaconfigure:AddFormDirective',
-)

src/Products/Five/form/objectwidget.py

-from zope.deferredimport import deprecated
-
-deprecated("Please import from five.formlib.objectwidget",
-    ObjectWidgetView = 'five.formlib.objectwidget:ObjectWidgetView',
-    ObjectWidget = 'five.formlib.objectwidget:ObjectWidget',
-    ObjectWidgetClass = 'five.formlib.objectwidget:ObjectWidgetClass',
-)

src/Products/Five/formlib/__init__.py

-# BBB
\ No newline at end of file

src/Products/Five/formlib/configure.zcml

-<configure xmlns="http://namespaces.zope.org/zope">
-
-  <include package="five.formlib" />
-
-</configure>

src/Products/Five/formlib/formbase.py

-from zope.deferredimport import deprecated
-
-deprecated("Please import from five.formlib.formbase",
-    FiveFormlibMixin = 'five.formlib.formbase:FiveFormlibMixin',
-    FormBase = 'five.formlib.formbase:FormBase',
-    EditFormBase = 'five.formlib.formbase:EditFormBase',
-    DisplayFormBase = 'five.formlib.formbase:DisplayFormBase',
-    AddFormBase = 'five.formlib.formbase:AddFormBase',
-    PageForm = 'five.formlib.formbase:PageForm',
-    PageEditForm = 'five.formlib.formbase:PageEditForm',
-    EditForm = 'five.formlib.formbase:EditForm',
-    PageDisplayForm = 'five.formlib.formbase:PageDisplayForm',
-    DisplayForm = 'five.formlib.formbase:DisplayForm',
-    PageAddForm = 'five.formlib.formbase:PageAddForm',
-    AddForm = 'five.formlib.formbase:AddForm',
-    SubPageForm = 'five.formlib.formbase:SubPageForm',
-    SubPageEditForm = 'five.formlib.formbase:SubPageEditForm',
-    SubPageDisplayForm = 'five.formlib.formbase:SubPageDisplayForm',
-)

src/Products/Five/meta.zcml

@@ -8,7 +8,6 @@
   <include package="zope.i18n" file="meta.zcml" />
 
   <include package=".browser" file="meta.zcml" />
-  <include package=".form" file="meta.zcml" />
 
   <meta:directives namespace="http://namespaces.zope.org/zope">
 

versions.cfg

@@ -8,7 +8,6 @@ DateTime = 2.12.0
 distribute = 0.6.10
 docutils = 0.6
 ExtensionClass = 2.11.3
-five.formlib = 1.0.2
 Jinja2 = 2.2.1
 mechanize = 0.1.11
 Persistence = 2.11.1
@@ -30,7 +29,6 @@ ZConfig = 2.7.1
 zdaemon = 2.0.4
 ZODB3 = 3.9.4
 zope.annotation = 3.5.0
-zope.app.form = 3.12.1
 zope.broken = 3.6.0
 zope.browser = 1.2
 zope.browsermenu = 3.9.0
@@ -47,7 +45,6 @@ zope.dottedname = 3.4.6
 zope.event = 3.4.1
 zope.exceptions = 3.5.2
 zope.filerepresentation = 3.6.0
-zope.formlib = 3.10.0
 zope.i18n = 3.7.2
 zope.i18nmessageid = 3.5.0
 zope.interface = 3.5.3