[Zope3-checkins] CVS: Zope3/src/zope/app/content/tests - test_sqlscript.py:1.1.2.2 testdt_sqltest.py:1.1.2.2

[Jim Fulton]

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

Modified Files:
      Tag: NameGeddon-branch
	test_sqlscript.py testdt_sqltest.py 
Log Message:
Searched for and changed over 1200 references to Zope.something.

Most of these were either comments, doc strings, or permission ids.

Many were imports or ids in zcml.  (much zcml fixup is still needed.



=== Zope3/src/zope/app/content/tests/test_sqlscript.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/content/tests/test_sqlscript.py:1.1.2.1	Mon Dec 23 14:31:30 2002
+++ Zope3/src/zope/app/content/tests/test_sqlscript.py	Tue Dec 24 07:51:00 2002
@@ -21,7 +21,7 @@
 from zope.app.interfaces.rdb import IZopeConnection
 from zope.app.interfaces.rdb import IZopeCursor
 from zope.component import getService
-from Zope.App.ComponentArchitecture import NextService
+from zope.app.component import nextservice
 from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.component.service import \
      serviceManager as sm
@@ -129,8 +129,8 @@
         PlacelessSetup.setUp(self)
         sm.defineService('SQLDatabaseConnections', IConnectionService)
         sm.provideService('SQLDatabaseConnections', ConnectionServiceStub())
-        self._old_getNextServiceManager = NextService.getNextServiceManager
-        NextService.getNextServiceManager = getNextServiceManager
+        self._old_getNextServiceManager = nextservice.getNextServiceManager
+        nextservice.getNextServiceManager = getNextServiceManager
         self.caching_service = CachingServiceStub()
         sm.defineService('Caching', ICachingService)
         sm.provideService('Caching', self.caching_service)
@@ -145,7 +145,7 @@
             AnnotationCacheable)
 
     def tearDown(self):
-        NextService.getNextServiceManager = self._old_getNextServiceManager
+        nextservice.getNextServiceManager = self._old_getNextServiceManager
 
     def _getScript(self):
         return SQLScript("my_connection",


=== Zope3/src/zope/app/content/tests/testdt_sqltest.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/content/tests/testdt_sqltest.py:1.1.2.1	Mon Dec 23 14:31:30 2002
+++ Zope3/src/zope/app/content/tests/testdt_sqltest.py	Tue Dec 24 07:51:00 2002
@@ -16,8 +16,7 @@
 """
 
 import unittest
-from zope.app.content.sql import SQLDTML 
-from Zope.App.OFS.Content.SQLScript import DT_SQLTest 
+from zope.app.content.sql import SQLDTML, comparison_operators
 
 
 class TestDT_SQLTest(unittest.TestCase):
@@ -62,7 +61,7 @@
 
 
     def testOperators(self):
-        for item in DT_SQLTest.comparison_operators.items():
+        for item in comparison_operators.items():
             html = self.doc_class(
                 "<dtml-sqltest column type=nb op=%s>" %item[0])
             result = "column %s 'name'" %item[1]