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

[efge at codespeak.net]

Author: efge
Date: Tue Mar 15 13:53:39 2005
New Revision: 9786

Modified:
   z3/Five/branch/zope28-integration/monkey.py
   z3/Five/branch/zope28-integration/traversable.py
Log:
Merge from HEAD 9783:9784

Modified: z3/Five/branch/zope28-integration/monkey.py
==============================================================================
--- z3/Five/branch/zope28-integration/monkey.py	(original)
+++ z3/Five/branch/zope28-integration/monkey.py	Tue Mar 15 13:53:39 2005
@@ -28,7 +28,6 @@
 
     HTTPRequest.getPresentationSkin = getPresentationSkin
     HTTPRequest.setPresentationSkin = setPresentationSkin
-    HTTPRequest.debug = DebugFlags()
 
     from RestrictedPython.Utilities import test
     from zope.tales.pythonexpr import PythonExpr
@@ -42,9 +41,3 @@
         return eval(self._code, vars)
 
     PythonExpr.__call__ = __call__
-
-class DebugFlags(object):
-    """Debugging flags."""
-
-    sourceAnnotations = False
-    showTAL = False

Modified: z3/Five/branch/zope28-integration/traversable.py
==============================================================================
--- z3/Five/branch/zope28-integration/traversable.py	(original)
+++ z3/Five/branch/zope28-integration/traversable.py	Tue Mar 15 13:53:39 2005
@@ -18,7 +18,6 @@
 from zope.app.traversing.interfaces import ITraverser, ITraversable
 from zope.app.traversing.adapters import DefaultTraversable
 from zope.app.traversing.adapters import traversePathElement
-from monkey import DebugFlags
 
 from zope.security.management import thread_local
 from AccessControl import getSecurityManager
@@ -28,8 +27,6 @@
 class FakeRequest:
     implements(IBrowserRequest)
 
-    debug = DebugFlags()
-
     def getPresentationSkin(self):
         return None