[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/app/ Converted removeAllProxies calls to the prefered removeSecurityProxy.

[Jim Fulton]

Log message for revision 27190:
  Converted removeAllProxies calls to the prefered removeSecurityProxy.
  


Changed:
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/adapter/adapter.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/__init__.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/utility/utility.py


-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/adapter/adapter.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/adapter/adapter.py	2004-08-20 17:02:06 UTC (rev 27189)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/adapter/adapter.py	2004-08-20 18:20:07 UTC (rev 27190)
@@ -22,7 +22,7 @@
 from zope.app.registration.registration import NotifyingRegistrationStack
 from zope.interface.adapter import adapterImplied, Default
 from zope.interface.adapter import Surrogate, AdapterRegistry
-from zope.proxy import removeAllProxies
+from zope.security.proxy import removeSecurityProxy
 import sys
 import zope.app.component.localservice
 import zope.app.container.contained
@@ -165,7 +165,7 @@
                     # (Why can't we?)  we need to think more about
                     # why/if this is truly safe
                     
-                    radapters[key] = removeAllProxies(registration.factory)
+                    radapters[key] = removeSecurityProxy(registration.factory)
 
     def adaptersChanged(self, *args):
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/__init__.py	2004-08-20 17:02:06 UTC (rev 27189)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/__init__.py	2004-08-20 18:20:07 UTC (rev 27190)
@@ -15,7 +15,7 @@
 
 $Id$
 """
-from zope.proxy import removeAllProxies
+from zope.security.proxy import removeSecurityProxy
 from zope.app import zapi
 from zope.app.container.browser.adding import Adding
 from zope.app.i18n import ZopeMessageIDFactory as _
@@ -483,7 +483,7 @@
         # we don't want to store security proxies (we can't,
         # actually), so we have to remove proxies here before passing
         # the context to the SiteManager.
-        bare = removeAllProxies(self.context)
+        bare = removeSecurityProxy(self.context)
         sm = SiteManager(bare)
         self.context.setSiteManager(sm)
         self.request.response.redirect(

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/utility/utility.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/utility/utility.py	2004-08-20 17:02:06 UTC (rev 27189)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/utility/utility.py	2004-08-20 18:20:07 UTC (rev 27190)
@@ -23,7 +23,7 @@
 from zope.app.utility.interfaces import ILocalUtilityService
 from zope.app.utility.interfaces import IUtilityRegistration
 from zope.component.utility import UtilityService
-from zope.proxy import removeAllProxies
+from zope.security.proxy import removeSecurityProxy
 import zope.app.site.interfaces
 import zope.interface
 import zope.interface.adapter
@@ -78,7 +78,7 @@
                     # why/if this is truly safe
                     
                     radapters[key] = radapters.get(key, ()) + (
-                        removeAllProxies(registration.factory), )
+                        removeSecurityProxy(registration.factory), )