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

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	testAbsoluteURL.py 
Log Message:
HOTYB: Merged SecurityProxy-branch into main branch.  

All tests pass and folders can be listed and added through the web.
It is likely that most other things don't work and will need to be
fixed. The reason is that many accesses that should have been checked
before are now being checked and additional checks and thinking about
permissions and security settings are needed.

I'm in the process of drafting a paper for the wiki that describes the
changes in more detail.


=== Zope3/lib/python/Zope/App/ZopePublication/AbsoluteURL/tests/testAbsoluteURL.py 1.1.2.2 => 1.1.2.3 ===
 from Zope.Publisher.Browser.IBrowserPublisher import IBrowserPublisher
 from Zope.Publisher.HTTP.tests.TestRequest import TestRequest
-from Zope.ContextWrapper import Wrapper
+from Zope.Proxy.ContextWrapper import ContextWrapper
 from Interface import Interface
 
 class IRoot(Interface): pass
@@ -65,9 +65,9 @@
         request = TestRequest()
         request.setViewType(IBrowserPublisher)
 
-        content = Wrapper(None, Root(), name='a')
-        content = Wrapper(None, content, name='b')
-        content = Wrapper(None, content, name='c')
+        content = ContextWrapper(object(), Root(), name='a')
+        content = ContextWrapper(object(), content, name='b')
+        content = ContextWrapper(object(), content, name='c')
         view = getRequestView(content, 'url', request)
         self.assertEqual(str(view), 'http://foobar.com/a/b/c')