[z3-checkins] r9796 - z3/Five/branch/zope28-integration

[efge at codespeak.net]

Author: efge
Date: Tue Mar 15 15:58:39 2005
New Revision: 9796

Removed:
   z3/Five/branch/zope28-integration/monkey.py
Modified:
   z3/Five/branch/zope28-integration/__init__.py
Log:
Removed last of monkey-patches.  The needed additions have been made
to Zope itself.

Requires Zope 2's five-integration SVN branch.



Modified: z3/Five/branch/zope28-integration/__init__.py
==============================================================================
--- z3/Five/branch/zope28-integration/__init__.py	(original)
+++ z3/Five/branch/zope28-integration/__init__.py	Tue Mar 15 15:58:39 2005
@@ -13,12 +13,8 @@
 import Acquisition
 from Globals import INSTANCE_HOME
 
-import monkey
 import zcml
 
-# trigger monkey patches
-monkey.monkeyPatch()
-
 # public API provided by Five
 # usage: from Products.Five import <something>
 from browser import BrowserView, StandardMacros

Deleted: /z3/Five/branch/zope28-integration/monkey.py
==============================================================================
--- /z3/Five/branch/zope28-integration/monkey.py	Tue Mar 15 15:58:39 2005
+++ (empty file)
@@ -1,30 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2004 Five Contributors. All rights reserved.
-#
-# This software is distributed under the terms of the Zope Public
-# License (ZPL) v2.1. See COPYING.txt for more information.
-#
-##############################################################################
-"""Bad monkey!
-
-$Id$
-"""
-def monkeyPatch():
-    """Trigger all monkey patches needed to make Five work.
-
-    This adjusts Zope 2 classes to make them work with Zope 3.
-
-    Monkey patches are kept to a minimum level.
-    """
-
-    from ZPublisher.HTTPRequest import HTTPRequest
-
-    def getPresentationSkin(self):
-        return getattr(self, '_presentation_skin', None)
-
-    def setPresentationSkin(self, skin):
-        self._presentation_skin = skin
-
-    HTTPRequest.getPresentationSkin = getPresentationSkin
-    HTTPRequest.setPresentationSkin = setPresentationSkin