[Zodb-checkins] CVS: Zope/lib/python/ZODB - ConflictResolution.py:1.18.52.1 DB.py:1.53.2.2.6.1 Mount.py:1.19.46.1

[Tres Seaver]

Update of /cvs-repository/Zope/lib/python/ZODB
In directory cvs.zope.org:/tmp/cvs-serv12097/lib/python/ZODB

Modified Files:
      Tag: tseaver-strexp_delenda-branch
	ConflictResolution.py DB.py Mount.py 
Log Message:



  - Rip string exceptins out by the root.

  - webdav/*:  clean up block statements for readability.

  - XXX:  Redirects are now showing up in the error log object;  need
          to filter!


=== Zope/lib/python/ZODB/ConflictResolution.py 1.18 => 1.18.52.1 ===
--- Zope/lib/python/ZODB/ConflictResolution.py:1.18	Mon Dec  9 17:31:19 2002
+++ Zope/lib/python/ZODB/ConflictResolution.py	Mon Nov 17 17:10:05 2003
@@ -14,6 +14,7 @@
 import sys
 from cStringIO import StringIO
 from cPickle import Unpickler, Pickler
+from pickle import PicklingError
 
 from ZODB.POSException import ConflictError
 import zLOG
@@ -49,7 +50,7 @@
         return "PR(%s %s)" % (id(self), self.data)
 
     def __getstate__(self):
-        raise "Can't pickle PersistentReference"
+        raise PicklingError, "Can't pickle PersistentReference"
 
 class PersistentReferenceFactory:
 


=== Zope/lib/python/ZODB/DB.py 1.53.2.2 => 1.53.2.2.6.1 ===
--- Zope/lib/python/ZODB/DB.py:1.53.2.2	Mon Sep 15 17:26:56 2003
+++ Zope/lib/python/ZODB/DB.py	Mon Nov 17 17:10:05 2003
@@ -277,7 +277,7 @@
         transaction.register(CommitVersion(self, source, destination))
 
     def exportFile(self, oid, file=None):
-        raise 'Not yet implemented'
+        raise NotImplementedError
 
     def getCacheDeactivateAfter(self):
         return self._cache_deactivate_after
@@ -301,7 +301,7 @@
         return self._version_pool_size
 
     def importFile(self, file):
-        raise 'Not yet implemented'
+        raise NotImplementedError
 
     def invalidate(self, oids, connection=None, version='',
                    rc=sys.getrefcount):


=== Zope/lib/python/ZODB/Mount.py 1.19 => 1.19.46.1 ===
--- Zope/lib/python/ZODB/Mount.py:1.19	Thu Feb  6 15:31:17 2003
+++ Zope/lib/python/ZODB/Mount.py	Mon Nov 17 17:10:05 2003
@@ -88,7 +88,7 @@
         '''Gets the database object, usually by creating a Storage object
         and returning ZODB.DB(storage).
         '''
-        raise 'NotImplemented'
+        raise NotImplementedError
 
     def _getDB(self):
         '''Creates or opens a DB object.