[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ZopePublication/AbsoluteURL - AbsoluteURL.py:1.1.2.2.4.1

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/ZopePublication/AbsoluteURL
In directory cvs.zope.org:/tmp/cvs-serv26237/lib/python/Zope/App/ZopePublication/AbsoluteURL

Modified Files:
      Tag: SecurityProxy-branch
	AbsoluteURL.py 
Log Message:
Changed security code to use security proxies and name-based
security. This has pretty far-reaching implications:

- You now protect names/operations, *not* values. This means it's as
  easy yo protect data attributes that have simple values as it is to
  protect methods.

- There is no longer a __permissions__ attribute. :)

- There is no longer a validate method in either security managers or
  policies. 

- No more need to have a special compiler for restricted code.
  In exchange, lots of objects are proxies and code sometimes needs to
  be prepared to remove proxies.

In addition:

- Basic objects (None, strings, numbers, etc.) are not wrapped in
  context wrappers.

- There is a test that fails unless Python 2.3 is used.



=== Zope3/lib/python/Zope/App/ZopePublication/AbsoluteURL/AbsoluteURL.py 1.1.2.2 => 1.1.2.2.4.1 ===
 """
 from Zope.Publisher.Browser.IBrowserPublisher import IBrowserPublisher
-from Zope.ContextWrapper import getinnercontext, getdict
+from Zope.Proxy.ContextWrapper import getWrapperContainer, getWrapperData
 from Zope.ComponentArchitecture import getRequestView
 
 class AbsoluteURL:
@@ -32,9 +32,9 @@
 
     def __str__(self):
         context = self.__context
-        dict = getdict(context)
+        dict = getWrapperData(context)
         name = dict and dict.get('name') or None
-        container = getinnercontext(context)
+        container = getWrapperContainer(context)
         if name is None or container is None:
             raise TypeError, 'Not enough context information to get a URL'