[Zope3-checkins] CVS: Zope3/src/zope/app/publication/tests - test_zopepublication.py:1.22

[Fred L. Drake, Jr.]

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

Modified Files:
	test_zopepublication.py 
Log Message:


remove use of the ZODB 4 "zodb" facade package; use ZODB 3 directly


=== Zope3/src/zope/app/publication/tests/test_zopepublication.py 1.21 => 1.22 ===
--- Zope3/src/zope/app/publication/tests/test_zopepublication.py:1.21	Fri Feb 20 11:57:27 2004
+++ Zope3/src/zope/app/publication/tests/test_zopepublication.py	Fri Feb 20 17:02:30 2004
@@ -150,7 +150,7 @@
         self.object = object()  # doesn't matter what it is
 
     def testRetryAllowed(self):
-        from zodb.interfaces import ConflictError
+        from ZODB.POSException import ConflictError
         from zope.publisher.interfaces import Retry
         try:
             raise ConflictError
@@ -160,7 +160,7 @@
             self.object, self.request, sys.exc_info(), retry_allowed=True)
 
     def testRetryNotAllowed(self):
-        from zodb.interfaces import ConflictError
+        from ZODB.POSException import ConflictError
         try:
             raise ConflictError
         except:
@@ -176,7 +176,7 @@
                          ' ConflictError: database conflict error')
 
     def testViewOnException(self):
-        from zodb.interfaces import ConflictError
+        from ZODB.POSException import ConflictError
         from zope.interface import Interface
         class IConflictError(Interface):
             pass
@@ -238,7 +238,7 @@
                 self.adapter = SideEffects(exception)
                 return self.adapter
         factory = SideEffectsFactory()
-        from zodb.interfaces import ConflictError
+        from ZODB.POSException import ConflictError
         from zope.interface import Interface
         class IConflictError(Interface):
             pass
@@ -262,7 +262,7 @@
         self.request._response = BrowserResponse(self.request.response._outstream)
         self.request.response.setHeader('Content-Type', 'application/pdf')
         self.request.response.setCookie('spam', 'eggs')
-        from zodb.interfaces import ConflictError
+        from ZODB.POSException import ConflictError
         try:
             raise ConflictError
         except: