[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/Publisher/Browser/tests - testDirectives.py:1.11.2.1 testFileResource.py:1.4.2.1 testGlobalBrowserMenuService.py:1.2.2.1 testGlobalBrowserMenuServiceDirectives.py:1.4.2.1 testI18nFileResource.py:1.2.2.1 testIconDirective.py:1.4.2.1 testResources.py:1.4.2.1

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/Publisher/Browser/tests
In directory cvs.zope.org:/tmp/cvs-serv10951/lib/python/Zope/App/Publisher/Browser/tests

Modified Files:
      Tag: ZopeDublinCore-branch
	testDirectives.py testFileResource.py 
	testGlobalBrowserMenuService.py 
	testGlobalBrowserMenuServiceDirectives.py 
	testI18nFileResource.py testIconDirective.py testResources.py 
Log Message:
Commiting branch prior to merge

=== Zope3/lib/python/Zope/App/Publisher/Browser/tests/testDirectives.py 1.11 => 1.11.2.1 ===
--- Zope3/lib/python/Zope/App/Publisher/Browser/tests/testDirectives.py:1.11	Tue Jun 25 10:44:51 2002
+++ Zope3/lib/python/Zope/App/Publisher/Browser/tests/testDirectives.py	Fri Oct  4 13:30:13 2002
@@ -20,7 +20,7 @@
 from Zope.ComponentArchitecture.tests.TestViews import IC, V1, VZMI, R1, RZMI
 from Zope.ComponentArchitecture import getView, queryView, queryResource
 from Zope.ComponentArchitecture import getDefaultViewName, getResource
-from Zope.ComponentArchitecture.tests.PlacelessSetup import PlacelessSetup
+from Zope.App.tests.PlacelessSetup import PlacelessSetup
 from Zope.Security.Proxy import ProxyFactory
 from cStringIO import StringIO
 


=== Zope3/lib/python/Zope/App/Publisher/Browser/tests/testFileResource.py 1.4 => 1.4.2.1 ===
--- Zope3/lib/python/Zope/App/Publisher/Browser/tests/testFileResource.py:1.4	Wed Jul 17 12:54:19 2002
+++ Zope3/lib/python/Zope/App/Publisher/Browser/tests/testFileResource.py	Fri Oct  4 13:30:13 2002
@@ -23,7 +23,7 @@
 
 from Zope.Exceptions import NotFoundError
 
-from Zope.ComponentArchitecture.tests.PlacelessSetup import PlacelessSetup
+from Zope.App.tests.PlacelessSetup import PlacelessSetup
 from Zope.ComponentArchitecture.GlobalResourceService import provideResource
 from Zope.ComponentArchitecture.GlobalAdapterService import provideAdapter
 


=== Zope3/lib/python/Zope/App/Publisher/Browser/tests/testGlobalBrowserMenuService.py 1.2 => 1.2.2.1 ===
--- Zope3/lib/python/Zope/App/Publisher/Browser/tests/testGlobalBrowserMenuService.py:1.2	Wed Jul 17 12:54:19 2002
+++ Zope3/lib/python/Zope/App/Publisher/Browser/tests/testGlobalBrowserMenuService.py	Fri Oct  4 13:30:13 2002
@@ -23,7 +23,7 @@
 from Zope.Exceptions import Forbidden, Unauthorized, DuplicationError
 from Interface import Interface
 from Zope.Publisher.Browser.BrowserRequest import TestRequest
-from Zope.ComponentArchitecture.tests.PlacelessSetup import PlacelessSetup
+from Zope.App.tests.PlacelessSetup import PlacelessSetup
 
 class I1(Interface): pass
 class I11(I1): pass


=== Zope3/lib/python/Zope/App/Publisher/Browser/tests/testGlobalBrowserMenuServiceDirectives.py 1.4 => 1.4.2.1 ===
--- Zope3/lib/python/Zope/App/Publisher/Browser/tests/testGlobalBrowserMenuServiceDirectives.py:1.4	Tue Oct  1 08:49:08 2002
+++ Zope3/lib/python/Zope/App/Publisher/Browser/tests/testGlobalBrowserMenuServiceDirectives.py	Fri Oct  4 13:30:13 2002
@@ -24,7 +24,7 @@
 from Zope.Configuration.xmlconfig import xmlconfig, XMLConfig
 from Zope.Publisher.Browser.IBrowserPublisher import IBrowserPublisher
 from Zope.Publisher.Browser.BrowserRequest import TestRequest
-from Zope.ComponentArchitecture.tests.PlacelessSetup import PlacelessSetup
+from Zope.App.tests.PlacelessSetup import PlacelessSetup
 
 import Zope.App.Publisher.Browser
 


=== Zope3/lib/python/Zope/App/Publisher/Browser/tests/testI18nFileResource.py 1.2 => 1.2.2.1 ===
--- Zope3/lib/python/Zope/App/Publisher/Browser/tests/testI18nFileResource.py:1.2	Wed Jul 17 12:54:19 2002
+++ Zope3/lib/python/Zope/App/Publisher/Browser/tests/testI18nFileResource.py	Fri Oct  4 13:30:13 2002
@@ -23,7 +23,7 @@
 
 from Zope.Exceptions import NotFoundError
 
-from Zope.ComponentArchitecture.tests.PlacelessSetup import PlacelessSetup
+from Zope.App.tests.PlacelessSetup import PlacelessSetup
 from Zope.ComponentArchitecture.GlobalResourceService import provideResource
 from Zope.ComponentArchitecture.GlobalAdapterService import provideAdapter
 


=== Zope3/lib/python/Zope/App/Publisher/Browser/tests/testIconDirective.py 1.4 => 1.4.2.1 ===
--- Zope3/lib/python/Zope/App/Publisher/Browser/tests/testIconDirective.py:1.4	Wed Jul 17 12:54:19 2002
+++ Zope3/lib/python/Zope/App/Publisher/Browser/tests/testIconDirective.py	Fri Oct  4 13:30:13 2002
@@ -22,7 +22,7 @@
 
 from Zope.Exceptions import Forbidden
 from Zope.Proxy.ProxyIntrospection import removeAllProxies
-from Zope.ComponentArchitecture.tests.PlacelessSetup import PlacelessSetup
+from Zope.App.tests.PlacelessSetup import PlacelessSetup
 from Zope.Configuration.xmlconfig import xmlconfig, XMLConfig
 from Zope.ComponentArchitecture.tests.Request import Request
 from Zope.ComponentArchitecture.tests.TestViews import IC


=== Zope3/lib/python/Zope/App/Publisher/Browser/tests/testResources.py 1.4 => 1.4.2.1 ===
--- Zope3/lib/python/Zope/App/Publisher/Browser/tests/testResources.py:1.4	Wed Jul 17 12:54:19 2002
+++ Zope3/lib/python/Zope/App/Publisher/Browser/tests/testResources.py	Fri Oct  4 13:30:13 2002
@@ -19,7 +19,7 @@
 
 from unittest import TestCase, TestSuite, main, makeSuite
 
-from Zope.ComponentArchitecture.tests.PlacelessSetup import PlacelessSetup
+from Zope.App.tests.PlacelessSetup import PlacelessSetup
 from Zope.ComponentArchitecture.GlobalResourceService import provideResource
 from Zope.ComponentArchitecture.GlobalAdapterService import provideAdapter