Merge r40576 through r40592 from 2.9 branch:

Log message for revision 40576:
  No longer use the defaultLayer directive.  It didn't do anything anyway.

Log message for revision 40587:
  Update Five to 1.3c.

Log message for revision 40588:
  Fred fix a speling error in Zope 3.2.

Log message for revision 40590:
  sync with five repo

Log message for revision 40592:
  Zope 2's version.txt will from now on reside on the Zope2 package.
  The reason for that is because zpkg and distutils can't deal with arbitrary
  data files that don't belong to a certain package.

lib/python/App/tests/test_version_txt.py

@@ -11,23 +11,19 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
+"""Tests of the version number extraction.
 
-"""Tests of the version number extraction."""
-
+$Id$
+"""
 import os
 import unittest
-
-import App.config
+import Zope2
 import App.version_txt
 
-
 class VersionTextTestCase(unittest.TestCase):
 
     def setUp(self):
-        self.cfg = App.config.getConfiguration()
-        self.old_swhome = self.cfg.softwarehome
-        self.cfg.softwarehome = os.path.dirname(__file__)
-        self.fn = os.path.join(self.cfg.softwarehome, "version.txt")
+        self.fn = os.path.join(os.path.dirname(Zope2.__file__), "version.txt")
         App.version_txt._test_reset()
 
     def tearDown(self):
@@ -35,8 +31,6 @@ class VersionTextTestCase(unittest.TestCase):
             os.unlink(self.fn)
         except OSError:
             pass
-        self.cfg.softwarehome = self.old_swhome
-        App.config.setConfiguration(self.cfg)
 
     def writeVersion(self, s):
         f = open(self.fn, 'w')

lib/python/App/version_txt.py

@@ -10,10 +10,12 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
+"""Extract Zope 2 version information
 
-import os,sys,re
-
-from App.config import getConfiguration
+$id$
+"""
+import os, sys, re
+import Zope2
 
 _version_string = None
 _zope_version = None
@@ -29,8 +31,7 @@ def _prep_version_data():
     if _version_string is None:
         v = sys.version_info
         pyver = "python %d.%d.%d, %s" % (v[0], v[1], v[2], sys.platform)
-        cfg = getConfiguration()
-        fn = os.path.join(cfg.softwarehome, 'version.txt')
+        fn = os.path.join(os.path.dirname(Zope2.__file__), 'version.txt')
         expr = re.compile(
             r'(?P<product>[A-Za-z0-9]+) +(?P<major>[0-9]+)'
             '\.(?P<minor>[0-9]+)\.(?P<micro>[0-9]+)'

lib/python/Products/Five/CHANGES.txt

@@ -2,7 +2,7 @@
 Five Changes
 ============
 
-Five 1.3c (unreleased)
+Five 1.3c (2005-12-06)
 ======================
 
 This version is also included in Zope 2.9b1.
@@ -10,6 +10,8 @@ This version is also included in Zope 2.9b1.
 Restructuring
 -------------
 
+* (b6) No longer use the ``defaultLayer`` directive, it's been deprecated.
+
 * (b4) Cleaned up security test.
 
 * (b4) Made Five send a ContainerModifiedEvent when appropriate.
@@ -17,6 +19,8 @@ Restructuring
 Bugfixes
 --------
 
+* (b6) Fixed the form i18n messages to work with Zope 3.2 beta 1.
+
 * (b3) Made the creation of custom skins work again.  It was broken in
   the port to Zope 3.2.
 

lib/python/Products/Five/browser/configure.zcml

@@ -20,11 +20,6 @@
       interface="zope.publisher.interfaces.browser.IDefaultBrowserLayer"
       />
 
-  <defaultLayer
-      type="zope.publisher.interfaces.browser.IBrowserRequest"
-      layer="zope.publisher.interfaces.browser.IDefaultBrowserLayer"
-      />
-
   <browser:page
       for="*"
       name="absolute_url"

lib/python/Products/Five/form/__init__.py

@@ -135,7 +135,7 @@ class EditView(BrowserView):
                     notify(ObjectModifiedEvent(content))
             except WidgetsError, errors:
                 self.errors = errors
-                status = _("An error occured.")
+                status = _("An error occurred.")
                 transaction.abort()
             else:
                 setUpEditWidgets(self, self.schema, source=self.adapted,
@@ -178,7 +178,7 @@ class AddView(EditView):
                 self.createAndAdd(data)
             except WidgetsError, errors:
                 self.errors = errors
-                self.update_status = _("An error occured.")
+                self.update_status = _("An error occurred.")
                 return self.update_status
 
             self.request.response.redirect(self.nextURL())

lib/python/Products/Five/version.txt

-Five 1.3b5
+Five 1.3c