[Zope3-checkins] CVS: Zope3/src/zope/app/publisher/browser/tests - test_directives.py:1.14.10.1 test_fileresource.py:1.5.10.1 test_globalbrowsermenuservice.py:1.9.10.1 test_icondirective.py:1.4.10.1 test_resource.py:1.1.14.1

[Grégoire Weber]

Update of /cvs-repository/Zope3/src/zope/app/publisher/browser/tests
In directory cvs.zope.org:/tmp/cvs-serv24874/src/zope/app/publisher/browser/tests

Modified Files:
      Tag: cw-mail-branch
	test_directives.py test_fileresource.py 
	test_globalbrowsermenuservice.py test_icondirective.py 
	test_resource.py 
Log Message:
Synced up with HEAD

=== Zope3/src/zope/app/publisher/browser/tests/test_directives.py 1.14 => 1.14.10.1 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_directives.py:1.14	Thu May  1 15:35:28 2003
+++ Zope3/src/zope/app/publisher/browser/tests/test_directives.py	Sun Jun 22 10:23:20 2003
@@ -16,7 +16,7 @@
 import unittest
 from cStringIO import StringIO
 
-from zope.interface import Interface
+from zope.interface import Interface, implements
 
 from zope.configuration.xmlconfig import xmlconfig, XMLConfig
 from zope.configuration.exceptions import ConfigurationError
@@ -26,7 +26,7 @@
 from zope.app.services.servicenames import Permissions
 from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.security.proxy import ProxyFactory
-from zope.proxy.introspection import removeAllProxies
+from zope.proxy import removeAllProxies
 import zope.configuration
 
 from zope.app.publisher.browser.globalbrowsermenuservice import \
@@ -69,13 +69,13 @@
             return super(VT, self).publishTraverse(request, name)
 
 class Ob:
-    __implements__ = IC
+    implements(IC)
 
 ob = Ob()
 
 class NCV(object):
     "non callable view"
-    
+
     def __init__(self, context, request):
         pass
 
@@ -87,7 +87,7 @@
 
 class C_w_implements(NCV):
 
-    __implements__ = Interface
+    implements(Interface)
 
     def index(self):
         return self


=== Zope3/src/zope/app/publisher/browser/tests/test_fileresource.py 1.5 => 1.5.10.1 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_fileresource.py:1.5	Thu May  1 15:35:28 2003
+++ Zope3/src/zope/app/publisher/browser/tests/test_fileresource.py	Sun Jun 22 10:23:20 2003
@@ -27,7 +27,7 @@
 
 from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.component.adapter import provideAdapter
-from zope.proxy.introspection import removeAllProxies
+from zope.proxy import removeAllProxies
 
 from zope.i18n.interfaces import IUserPreferredCharsets
 


=== Zope3/src/zope/app/publisher/browser/tests/test_globalbrowsermenuservice.py 1.9 => 1.9.10.1 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_globalbrowsermenuservice.py:1.9	Thu May  1 15:35:28 2003
+++ Zope3/src/zope/app/publisher/browser/tests/test_globalbrowsermenuservice.py	Sun Jun 22 10:23:20 2003
@@ -21,7 +21,7 @@
 from unittest import TestCase, main, makeSuite
 from zope.publisher.interfaces.browser import IBrowserPublisher
 from zope.exceptions import Forbidden, Unauthorized, DuplicationError
-from zope.interface import Interface
+from zope.interface import Interface, implements
 from zope.publisher.browser import TestRequest
 from zope.app.tests.placelesssetup import PlacelessSetup
 
@@ -37,7 +37,7 @@
 class I111(I11): pass
 
 class X:
-    __implements__ = IBrowserPublisher, I111
+    implements(IBrowserPublisher, I111)
 
     def f(self): pass
 


=== Zope3/src/zope/app/publisher/browser/tests/test_icondirective.py 1.4 => 1.4.10.1 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_icondirective.py:1.4	Thu May  1 15:35:28 2003
+++ Zope3/src/zope/app/publisher/browser/tests/test_icondirective.py	Sun Jun 22 10:23:20 2003
@@ -21,7 +21,7 @@
 from unittest import TestCase, main, makeSuite
 
 from zope.exceptions import Forbidden
-from zope.proxy.introspection import removeAllProxies
+from zope.proxy import removeAllProxies
 from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.configuration.xmlconfig import xmlconfig, XMLConfig
 from zope.publisher.browser import TestRequest
@@ -30,6 +30,7 @@
 from zope.component import queryView, getView, getResource
 from zope.configuration.exceptions import ConfigurationError
 import zope.configuration
+from zope.interface import implements
 
 import zope.app.publisher.browser
 
@@ -44,7 +45,7 @@
 request = TestRequest(IBrowserPresentation)
 
 class Ob:
-    __implements__ = IC
+    implements(IC)
 
 ob = Ob()
 


=== Zope3/src/zope/app/publisher/browser/tests/test_resource.py 1.1 => 1.1.14.1 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_resource.py:1.1	Tue Apr 15 08:24:33 2003
+++ Zope3/src/zope/app/publisher/browser/tests/test_resource.py	Sun Jun 22 10:23:20 2003
@@ -18,7 +18,7 @@
 
 import unittest
 from zope.publisher.browser import TestRequest
-from zope.proxy.context import ContextWrapper
+from zope.app.context import ContextWrapper
 
 class TestResource(unittest.TestCase):