Log message for revision 40378:
  Merge r40377 from 2.9 branch:
    Stitch in more recent Zope 3 and get rid of a monkey in Five
  

Changed:
  _U  Zope/trunk/lib/python/
  U   Zope/trunk/lib/python/Products/Five/__init__.py
  D   Zope/trunk/lib/python/Products/Five/monkey.py
  _U  Zope/trunk/lib/python/zope/

-=-

Property changes on: Zope/trunk/lib/python
___________________________________________________________________
Name: svn:externals
   - ZConfig        svn://svn.zope.org/repos/main/ZConfig/tags/ZConfig-2.3.1
BTrees         svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b3/src/BTrees
persistent     svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b3/src/persistent
ThreadedAsync  svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b3/src/ThreadedAsync
transaction    svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b3/src/transaction
ZEO            svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b3/src/ZEO
ZODB           svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b3/src/ZODB
ZopeUndo       svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b3/src/ZopeUndo
zdaemon        -r 39732 svn://svn.zope.org/repos/main/zdaemon/trunk/src/zdaemon
pytz           -r 40034 svn://svn.zope.org/repos/main/Zope3/trunk/src/pytz
zodbcode       -r 40034 svn://svn.zope.org/repos/main/Zope3/trunk/src/zodbcode
ClientCookie   -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/ClientCookie
mechanize      -r 40034 svn://svn.zope.org/repos/main/Zope3/trunk/src/mechanize

   + ZConfig        svn://svn.zope.org/repos/main/ZConfig/tags/ZConfig-2.3.1
BTrees         svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b3/src/BTrees
persistent     svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b3/src/persistent
ThreadedAsync  svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b3/src/ThreadedAsync
transaction    svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b3/src/transaction
ZEO            svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b3/src/ZEO
ZODB           svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b3/src/ZODB
ZopeUndo       svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b3/src/ZopeUndo
zdaemon        -r 39732 svn://svn.zope.org/repos/main/zdaemon/trunk/src/zdaemon
pytz           -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/pytz
zodbcode       -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zodbcode
ClientCookie   -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/ClientCookie
mechanize      -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/mechanize


Modified: Zope/trunk/lib/python/Products/Five/__init__.py
===================================================================
--- Zope/trunk/lib/python/Products/Five/__init__.py     2005-11-26 08:49:03 UTC 
(rev 40377)
+++ Zope/trunk/lib/python/Products/Five/__init__.py     2005-11-26 09:17:49 UTC 
(rev 40378)
@@ -18,12 +18,8 @@
 import Acquisition
 from Globals import INSTANCE_HOME
 
-import monkey # BBB: goes away when Zope 3.2 >= r40368 is stiched in
 import zcml
 
-# trigger monkey patches
-monkey.monkeyPatch()
-
 # public API provided by Five
 # usage: from Products.Five import <something>
 from browser import BrowserView

Deleted: Zope/trunk/lib/python/Products/Five/monkey.py
===================================================================
--- Zope/trunk/lib/python/Products/Five/monkey.py       2005-11-26 08:49:03 UTC 
(rev 40377)
+++ Zope/trunk/lib/python/Products/Five/monkey.py       2005-11-26 09:17:49 UTC 
(rev 40378)
@@ -1,71 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2005 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Bad monkey!
-
-BBB: goes away when Zope 3.2 >= r40368 is stiched in
-
-$Id$
-"""
-def monkeyPatch():
-    """Trigger all monkey patches needed to make Five work.
-
-    Monkey patches are kept to a minimum level.
-    """
-    zope3_monkey()
-
-def zope3_monkey():
-    """Fix Zope 3 to have the proper ContainerModifiedEvent that has
-    been added for 3.2.
-    """
-    try:
-        from zope.app.container.contained import notifyContainerModified
-    except ImportError:
-        pass
-    else:
-        return
-
-    # BBB: goes away when Zope 3.2 >= r40368 is stiched in
-
-    from zope.event import notify
-    from zope.interface import implements
-    import zope.app.container.contained
-    import zope.app.container.interfaces
-    from zope.app.event.objectevent import ObjectModifiedEvent
-    from zope.app.event.interfaces import IObjectModifiedEvent
-
-    class IContainerModifiedEvent(IObjectModifiedEvent):
-        """The container has been modified.
-
-        This event is specific to "containerness" modifications, which
-        means addition, removal or reordering of sub-objects.
-        """
-
-    zope.app.container.interfaces.IContainerModifiedEvent = \
-        IContainerModifiedEvent
-
-
-    class ContainerModifiedEvent(ObjectModifiedEvent):
-        """The container has been modified."""
-        implements(IContainerModifiedEvent)
-
-    zope.app.container.contained.ContainerModifiedEvent = \
-        ContainerModifiedEvent
-
-
-    def notifyContainerModified(object, *descriptions):
-        """Notify that the container was modified."""
-        notify(ContainerModifiedEvent(object, *descriptions))
-
-    zope.app.container.contained.notifyContainerModified = \
-        notifyContainerModified


Property changes on: Zope/trunk/lib/python/zope
___________________________________________________________________
Name: svn:externals
   - app              -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/app
cachedescriptors -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/cachedescriptors
component        -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/component
configuration    -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/configuration
documenttemplate -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/documenttemplate
event            -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/event
exceptions       -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/exceptions
hookable         -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/hookable
i18n             -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/i18n
i18nmessageid    -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/i18nmessageid
interface        -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/interface
modulealias      -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/modulealias
pagetemplate     -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/pagetemplate
proxy            -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/proxy
publisher        -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/publisher
schema           -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/schema
security         -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/security
server           -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/server
structuredtext   -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/structuredtext
tal              -r 40034 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/tal
tales            -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/tales
testing          -r 39830 
svn://svn.zope.org/repos/main/zope.testing/trunk/src/zope/testing
thread           -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/thread
deprecation      -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/deprecation
dottedname       -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/dottedname
formlib          -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/formlib
index            -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/index
testbrowser      -r 40034 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/testbrowser

   + app              -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/app
cachedescriptors -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/cachedescriptors
component        -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/component
configuration    -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/configuration
documenttemplate -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/documenttemplate
event            -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/event
exceptions       -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/exceptions
hookable         -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/hookable
i18n             -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/i18n
i18nmessageid    -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/i18nmessageid
interface        -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/interface
modulealias      -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/modulealias
pagetemplate     -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/pagetemplate
proxy            -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/proxy
publisher        -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/publisher
schema           -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/schema
security         -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/security
server           -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/server
structuredtext   -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/structuredtext
tal              -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/tal
tales            -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/tales
testing          -r 39830 
svn://svn.zope.org/repos/main/zope.testing/trunk/src/zope/testing
thread           -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/thread
deprecation      -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/deprecation
dottedname       -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/dottedname
formlib          -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/formlib
index            -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/index
testbrowser      -r 40369 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/testbrowser


_______________________________________________
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

Reply via email to