[Zope3-checkins] CVS: Zope3/src/zope/app/publication/tests - test_browserpublication.py:1.13

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/publication/tests
In directory cvs.zope.org:/tmp/cvs-serv11791/src/zope/app/publication/tests

Modified Files:
	test_browserpublication.py 
Log Message:
Deprecated zope.proxy.introspection. Just use zope.proxy.

Now getObject comes from zope.proxy


=== Zope3/src/zope/app/publication/tests/test_browserpublication.py 1.12 => 1.13 ===
--- Zope3/src/zope/app/publication/tests/test_browserpublication.py:1.12	Tue May 27 10:18:22 2003
+++ Zope3/src/zope/app/publication/tests/test_browserpublication.py	Wed May 28 11:46:30 2003
@@ -25,9 +25,9 @@
 from zope.publisher.interfaces.browser \
      import IBrowserPresentation, IBrowserPublisher
 
-from zope.context import getWrapperContext, wrapperTypes
-from zope.proxy.introspection import removeAllProxies
-from zope.security.proxy import Proxy, getObject
+from zope.context import getWrapperContext, isWrapper
+from zope.proxy import removeAllProxies, getObject
+from zope.security.proxy import Proxy
 from zope.security.checker import defineChecker, NamesChecker
 
 from zope.app.security.registries.principalregistry import principalRegistry
@@ -178,7 +178,7 @@
         self.failUnless(ob2 is not ob)
         self.failUnless(type(ob2) is Proxy)
         ob2 = getObject(ob2)
-        self.failUnless(type(ob2) in wrapperTypes)
+        self.failUnless(isWrapper(ob2))
 
     def testAdaptedTraverseNameWrapping(self):
 
@@ -202,7 +202,7 @@
         ob2 = pub.traverseName(self._createRequest('/bruce', pub), ob, 'bruce')
         self.failUnless(type(ob2) is Proxy)
         ob2 = getObject(ob2)
-        self.failUnless(type(ob2) in wrapperTypes)
+        self.failUnless(isWrapper(ob2))
         unw = removeAllProxies(ob2)
         self.assertEqual(unw.v, 'bruce')
 
@@ -226,7 +226,7 @@
         self.assertEqual(x, 'dummy')
         self.failUnless(type(ob2) is Proxy)
         ob2 = getObject(ob2)
-        self.failUnless(type(ob2) in wrapperTypes)
+        self.failUnless(isWrapper(ob2))
         unw = removeAllProxies(ob2)
         self.assertEqual(unw.v, 'bruce')