Log message for revision 40244: Merge r40243 from 2.9 branch: Update included Five to version 1.3b3. See Products/Five/CHANGES.txt for more info.
Changed: U Zope/trunk/lib/python/Products/Five/CHANGES.txt U Zope/trunk/lib/python/Products/Five/INSTALL.txt U Zope/trunk/lib/python/Products/Five/browser/configure.zcml A Zope/trunk/lib/python/Products/Five/browser/tests/skin.txt A Zope/trunk/lib/python/Products/Five/browser/tests/skin.zcml A Zope/trunk/lib/python/Products/Five/browser/tests/test_skin.py U Zope/trunk/lib/python/Products/Five/meta.zcml U Zope/trunk/lib/python/Products/Five/version.txt U Zope/trunk/lib/python/Products/Five/zcml.py -=- Modified: Zope/trunk/lib/python/Products/Five/CHANGES.txt =================================================================== --- Zope/trunk/lib/python/Products/Five/CHANGES.txt 2005-11-19 10:22:13 UTC (rev 40243) +++ Zope/trunk/lib/python/Products/Five/CHANGES.txt 2005-11-19 10:25:32 UTC (rev 40244) @@ -2,16 +2,33 @@ Five Changes ============ +Five 1.3b3 (2005-11-19) +======================= + +This version is also included in Zope 2.9b1. + +Bugfixes +-------- + +* Made the creation of custom skins work again. It was broken in the + port to Zope 3.2. + Five 1.3b2 (2005-11-10) ======================= -This version is included in Zope 2 trunk as of this date. +Changes compared to Five 1.3b: +Bugfixes +-------- + +* Fixed bug that broke WebDAV access for five:defaultViewable objects. The + __browser_default__ now modifies only GET and POST requests. + +* Fixed some event recursion compatibility modes. + Five 1.3b (2005-11-02) ====================== -This version is also included in Zope 2.9b1. - Restructuring ------------- Modified: Zope/trunk/lib/python/Products/Five/INSTALL.txt =================================================================== --- Zope/trunk/lib/python/Products/Five/INSTALL.txt 2005-11-19 10:22:13 UTC (rev 40243) +++ Zope/trunk/lib/python/Products/Five/INSTALL.txt 2005-11-19 10:25:32 UTC (rev 40244) @@ -1,8 +1,8 @@ How to install Five -------------------- +=================== Requirements for Five 1.3 -========================= +------------------------- * Zope 2.9+ with Python 2.4.1+ @@ -10,8 +10,29 @@ a newer Five version in your instance, if you like. It will override the Five product inside the Zope tree. + +Compatability matrix +-------------------- + +The following table shows which Five version can and should be used +with which Zope 2 and Zope 3 versions. + +============ ======================= =========== ======== +. Zope 2.7 Zope 2.8 Zope 2.9 +------------ ----------------------- ----------- -------- +. Zope X3 3.0 (not incl.) Zope X3 3.0 Zope 3.2 +============ ======================= =========== ======== +Five 1.0 X included +Five 1.1[#]_ X X +Five 1.2 X +Five 1.3 included +============ ======================= =========== ======== + +.. [#] This branch is no longer actively maintained. + + Running the tests -================= +----------------- For information on how to install the automatic Five tests, please see ``tests/README.txt``. Modified: Zope/trunk/lib/python/Products/Five/browser/configure.zcml =================================================================== --- Zope/trunk/lib/python/Products/Five/browser/configure.zcml 2005-11-19 10:22:13 UTC (rev 40243) +++ Zope/trunk/lib/python/Products/Five/browser/configure.zcml 2005-11-19 10:25:32 UTC (rev 40244) @@ -3,6 +3,28 @@ <browser:defaultView name="index.html" /> + <interface + interface="zope.publisher.interfaces.browser.ILayer" + /> + + <interface + interface="zope.publisher.interfaces.browser.ISkin" + /> + + <interface + interface="zope.app.publisher.interfaces.browser.IMenuItemType" + /> + + <browser:layer + name="default" + 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" Copied: Zope/trunk/lib/python/Products/Five/browser/tests/skin.txt (from rev 40243, Zope/branches/2.9/lib/python/Products/Five/browser/tests/skin.txt) Copied: Zope/trunk/lib/python/Products/Five/browser/tests/skin.zcml (from rev 40243, Zope/branches/2.9/lib/python/Products/Five/browser/tests/skin.zcml) Copied: Zope/trunk/lib/python/Products/Five/browser/tests/test_skin.py (from rev 40243, Zope/branches/2.9/lib/python/Products/Five/browser/tests/test_skin.py) Modified: Zope/trunk/lib/python/Products/Five/meta.zcml =================================================================== --- Zope/trunk/lib/python/Products/Five/meta.zcml 2005-11-19 10:22:13 UTC (rev 40243) +++ Zope/trunk/lib/python/Products/Five/meta.zcml 2005-11-19 10:25:32 UTC (rev 40244) @@ -79,6 +79,12 @@ handler="zope.app.schema.metaconfigure.vocabulary" /> + <meta:directive + name="defaultLayer" + schema="zope.app.component.metadirectives.IDefaultLayerDirective" + handler="zope.app.component.metaconfigure.defaultLayer" + /> + </meta:directives> <meta:directives namespace="http://namespaces.zope.org/five"> Modified: Zope/trunk/lib/python/Products/Five/version.txt =================================================================== --- Zope/trunk/lib/python/Products/Five/version.txt 2005-11-19 10:22:13 UTC (rev 40243) +++ Zope/trunk/lib/python/Products/Five/version.txt 2005-11-19 10:25:32 UTC (rev 40244) @@ -1 +1 @@ -Five 1.3b2 +Five 1.3b3 Modified: Zope/trunk/lib/python/Products/Five/zcml.py =================================================================== --- Zope/trunk/lib/python/Products/Five/zcml.py 2005-11-19 10:22:13 UTC (rev 40243) +++ Zope/trunk/lib/python/Products/Five/zcml.py 2005-11-19 10:25:32 UTC (rev 40244) @@ -41,13 +41,13 @@ _context = xmlconfig.file(file) -def load_config(file, package=None): +def load_config(file, package=None, execute=True): """Load an additional ZCML file into the context. Use with extreme care. """ global _context - _context = xmlconfig.file(file, package, _context) + _context = xmlconfig.file(file, package, _context, execute=execute) def load_string(s): """Load a snipped of ZCML into the context. _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins