[Zope3-checkins] CVS: Zope3/src/zope/context - __init__.py:1.17

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/context
In directory cvs.zope.org:/tmp/cvs-serv25942/src/zope/context

Modified Files:
	__init__.py 
Log Message:
renamed zope.proxy.getObject to zope.proxy.getProxiedObject


=== Zope3/src/zope/context/__init__.py 1.16 => 1.17 ===
--- Zope3/src/zope/context/__init__.py:1.16	Wed May 28 11:46:51 2003
+++ Zope3/src/zope/context/__init__.py	Wed May 28 13:19:22 2003
@@ -32,7 +32,7 @@
 from zope.context.wrapper import ContextMethod, ContextProperty
 from zope.context.wrapper import Wrapper
 from zope.security.checker import defineChecker, selectChecker, BasicTypes
-from zope.proxy import queryProxy, queryInnerProxy, isProxy, getObject
+from zope.proxy import queryProxy, queryInnerProxy, isProxy, getProxiedObject
 from zope.context.interfaces import IContextWrapper
 from zope.hookable import hookable
 
@@ -47,7 +47,7 @@
     if type(_ob) is Proxy:
         # insert into proxies
         checker = getChecker(_ob)
-        _ob = getObject(_ob)
+        _ob = getProxiedObject(_ob)
         _ob = Proxy(Wrapper(_ob, _parent, **kw), checker)
     else:
         _ob = Wrapper(_ob, _parent, **kw)
@@ -69,10 +69,10 @@
     elif type(_ob) is Proxy:
         # insert into proxies
         checker = getChecker(_ob)
-        _ob = getObject(_ob)
-        _ob = Proxy(getObject(_ob), checker)
+        _ob = getProxiedObject(_ob)
+        _ob = Proxy(getProxiedObject(_ob), checker)
     else:
-        _ob = getObject(_ob)
+        _ob = getProxiedObject(_ob)
 
     return _ob
 
@@ -149,7 +149,7 @@
 
 # XXX Do I actually need these?
 def _contextWrapperChecker(ob):
-    return selectChecker(getObject(ob))
+    return selectChecker(getProxiedObject(ob))
 defineChecker(Wrapper, _contextWrapperChecker)
 
 class ContextSuper: