- Bug: Completed the Zope 3.4 backwards-compatibility. Also created a…

… buidlout

  configuration file to test the Zope 3.4 compatibility. Note: You *must* use
  the 'latest' or 'zope34' extra now to get all required
  packages. Alternatively, you can specify the packages listed in either of
  those extras explicitely in your product's required packages.

CHANGES.txt

@@ -12,6 +12,11 @@ Version 2.1.0 (unreleased)
   manager is only registered for dict, because it would otherwise get
   picked up in undesired scenarios.
 
+- Bug: Completed the Zope 3.4 backwards-compatibility. Also created a buidlout
+  configuration file to test the Zope 3.4 compatibility. Note: You *must* use
+  the 'latest' or 'zope34' extra now to get all required packages.
+
+
 Version 2.0.0 (2009-06-14)
 --------------------------
 

buildout-3.4.cfg

@@ -0,0 +1,13 @@
+[buildout]
+extends = buildout.cfg versions-3.4.cfg
+parts = test-no-z3zpt python
+versions = versions
+
+[test-no-z3zpt]
+recipe = zc.recipe.testrunner
+eggs = z3c.form [test,zope34]
+
+[versions]
+z3c.form =
+lxml = 2.1.1
+zc.sourcefactory = 0.4.0

buildout.cfg

@@ -1,6 +1,6 @@
 [buildout]
 develop = . benchmark
-parts = test test-no-z3cpt checker coverage-test coverage-report docs i18n
+parts = test test-no-z3zpt checker coverage-test coverage-report docs i18n
         benchmark python
 
 [test-environment]
@@ -9,12 +9,12 @@ CHAMELEON_CACHE = False
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = z3c.form [test,extra]
+eggs = z3c.form [test,extra,latest]
 environment = test-environment
 
-[test-no-z3cpt]
+[test-no-z3zpt]
 recipe = zc.recipe.testrunner
-eggs = z3c.form [test]
+eggs = z3c.form [test,latest]
 
 [checker]
 recipe = lovely.recipe:importchecker

setup.py

@@ -42,6 +42,7 @@ def read(*rnames):
                  'term.txt',
                  'util.txt')])
 
+
 setup (
     name='z3c.form',
     version='2.1.0dev',
@@ -84,14 +85,20 @@ def read(*rnames):
             'z3c.coverage',
             'z3c.template',
             'zc.sourcefactory',
+            # zope.app.container pulls in zope.container, if newer version
             'zope.app.container',
             'zope.app.i18n',
             'zope.app.pagetemplate',
             'zope.app.security',
             'zope.app.testing',
-            'zope.container',
             'zope.testing',
             ],
+        zope34 = [
+            'zope.app.component',
+            ],
+        latest = [
+            'zope.site',
+            ],
         adding = ['zope.app.container'],
         docs = ['z3c.recipe.sphinxdoc'],
         ),
@@ -110,7 +117,9 @@ def read(*rnames):
         'zope.publisher',
         'zope.schema',
         'zope.security',
-        'zope.site',
+        # Since the required package depends on the versions of the other
+        # packages, so not require it directly.
+        #'zope.site' or 'zope.app.component',
         'zope.traversing',
         ],
     zip_safe = False,

src/z3c/form/compatibility.py

@@ -18,6 +18,8 @@
 __docformat__ = "reStructuredText"
 import datetime
 import decimal
+import sys
+import types
 import zope.interface
 
 def addHooks():
@@ -32,6 +34,22 @@ def addHooks():
         import zope.site
         import zope.app.component.hooks
         zope.site.hooks = zope.app.component.hooks
+    except ImportError:
+        import zope.app.component.hooks
+        site = types.ModuleType('site')
+        site.hooks = zope.app.component.hooks
+        sys.modules['zope.site'] = site
+
+def addBTree():
+    try:
+        import zope.container.btree
+        return
+    except ImportError:
+        import zope.app.container.btree
+        container = types.ModuleType('container')
+        container.btree = zope.app.container.btree
+        sys.modules['zope.container'] = container
 
 def apply():
     addHooks()
+    addBTree()

versions-3.4.cfg

@@ -0,0 +1,171 @@
+[versions]
+ClientForm = 0.2.9
+RestrictedPython = 3.4.2
+ZConfig = 2.5.1
+ZODB3 = 3.8.1
+docutils = 0.4
+jquery.javascript = 1.0.0
+jquery.layer = 1.0.0
+lxml = 1.3.6
+mechanize = 0.1.7b
+pytz = 2007k
+setuptools = 0.6c9
+z3c.coverage = 1.1.2
+z3c.csvvocabulary = 1.0.0
+z3c.etestbrowser = 1.0.4
+z3c.form = 1.9.0
+z3c.formdemo = 1.5.3
+z3c.formjs = 0.4.0
+z3c.formjsdemo = 0.3.1
+z3c.formui = 1.4.2
+z3c.i18n = 0.1.1
+z3c.layer = 0.2.3
+z3c.macro = 1.1.0
+z3c.macroviewlet = 1.0.0
+z3c.menu = 0.2.0
+z3c.optionstorage = 1.0.4
+z3c.pagelet = 1.0.2
+z3c.rml = 0.7.3
+z3c.skin.pagelet = 1.0.2
+z3c.template = 1.1.0
+z3c.testing = 0.2.0
+z3c.traverser = 0.2.3
+z3c.viewlet = 1.0.0
+z3c.viewtemplate = 0.3.2
+z3c.zrtresource = 1.0.1
+zc.buildout = 1.1.1
+zc.catalog = 1.2.0
+zc.datetimewidget = 0.5.2
+zc.i18n = 0.5.2
+zc.recipe.egg = 1.0.0
+zc.recipe.filestorage = 1.0.0
+zc.recipe.testrunner = 1.0.0
+zc.resourcelibrary = 1.0.1
+zc.table = 0.6
+zc.zope3recipes = 0.6.2
+zdaemon = 2.0.2
+zodbcode = 3.4.0
+zope.annotation = 3.4.1
+zope.app.annotation = 3.4.0
+zope.app.apidoc = 3.4.3
+zope.app.applicationcontrol = 3.4.3
+zope.app.appsetup = 3.4.1
+zope.app.authentication = 3.4.4
+zope.app.basicskin = 3.4.0
+zope.app.boston = 3.4.0
+zope.app.broken = 3.4.0
+zope.app.cache = 3.4.1
+zope.app.catalog = 3.5.1
+zope.app.component = 3.4.1
+zope.app.container = 3.5.6
+zope.app.content = 3.4.0
+zope.app.dav = 3.4.1
+zope.app.debug = 3.4.1
+zope.app.debugskin = 3.4.0
+zope.app.dependable = 3.4.0
+zope.app.dtmlpage = 3.4.1
+zope.app.error = 3.5.1
+zope.app.exception = 3.4.1
+zope.app.externaleditor = 3.4.0
+zope.app.file = 3.4.4
+zope.app.folder = 3.4.0
+zope.app.form = 3.4.1
+zope.app.ftp = 3.4.0
+zope.app.generations = 3.4.1
+zope.app.homefolder = 3.4.0
+zope.app.http = 3.4.1
+zope.app.i18n = 3.4.4
+zope.app.i18nfile = 3.4.1
+zope.app.interface = 3.4.0
+zope.app.interpreter = 3.4.0
+zope.app.intid = 3.4.1
+zope.app.keyreference = 3.4.1
+zope.app.layers = 3.4.0
+zope.app.locales = 3.4.5
+zope.app.locking = 3.4.0
+zope.app.module = 3.4.0
+zope.app.onlinehelp = 3.4.1
+zope.app.pagetemplate = 3.4.1
+zope.app.pluggableauth = 3.4.0
+zope.app.preference = 3.4.1
+zope.app.preview = 3.4.0
+zope.app.principalannotation = 3.4.0
+zope.app.publication = 3.4.3
+zope.app.publisher = 3.4.1
+zope.app.pythonpage = 3.4.1
+zope.app.renderer = 3.4.0
+zope.app.rotterdam = 3.4.1
+zope.app.schema = 3.4.0
+zope.app.security = 3.5.2
+zope.app.securitypolicy = 3.4.6
+zope.app.server = 3.4.2
+zope.app.session = 3.5.1
+zope.app.skins = 3.4.0
+zope.app.sqlscript = 3.4.1
+zope.app.testing = 3.4.3
+zope.app.traversing = 3.4.0
+zope.app.tree = 3.4.0
+zope.app.twisted = 3.4.1
+zope.app.undo = 3.4.0
+zope.app.wfmc = 0.1.2
+zope.app.workflow = 3.4.1
+zope.app.wsgi = 3.4.1
+zope.app.xmlrpcintrospection = 3.4.0
+zope.app.zapi = 3.4.0
+zope.app.zcmlfiles = 3.4.3
+zope.app.zopeappgenerations = 3.4.0
+zope.app.zptpage = 3.4.1
+zope.cachedescriptors = 3.4.1
+zope.component = 3.4.0
+zope.configuration = 3.4.0
+zope.contentprovider = 3.4.0
+zope.contenttype = 3.4.0
+zope.copypastemove = 3.4.0
+zope.datetime = 3.4.0
+zope.decorator = 3.4.0
+zope.deferredimport = 3.4.0
+zope.deprecation = 3.4.0
+zope.documenttemplate = 3.4.0
+zope.dottedname = 3.4.2
+zope.dublincore = 3.4.0
+zope.error = 3.5.1
+zope.event = 3.4.0
+zope.exceptions = 3.4.0
+zope.file = 0.3.0
+zope.filerepresentation = 3.4.0
+zope.formlib = 3.4.0
+zope.hookable = 3.4.0
+zope.html = 1.0.1
+zope.i18n = 3.4.0
+zope.i18nmessageid = 3.4.3
+zope.index = 3.4.1
+zope.interface = 3.4.1
+zope.lifecycleevent = 3.4.0
+zope.location = 3.4.0
+zope.mimetype = 0.3.0
+zope.minmax = 1.1.0
+zope.modulealias = 3.4.0
+zope.pagetemplate = 3.4.0
+zope.proxy = 3.4.2
+zope.publisher = 3.4.6
+zope.rdb = 3.4.0
+zope.schema = 3.4.0
+zope.security = 3.4.1
+zope.securitypolicy = 3.4.1
+zope.sendmail = 3.4.0
+zope.sequencesort = 3.4.0
+zope.server = 3.4.3
+zope.session = 3.4.1
+zope.size = 3.4.0
+zope.structuredtext = 3.4.0
+zope.tal = 3.4.1
+zope.tales = 3.4.0
+zope.testbrowser = 3.4.2
+zope.testing = 3.5.6
+zope.testrecorder = 0.3.0
+zope.thread = 3.4
+zope.traversing = 3.4.1
+zope.ucol = 1.0.2
+zope.viewlet = 3.4.2
+zope.wfmc = 3.4.0
+zope.xmlpickle = 3.4.0