- Merge tseaver-strexp_delenda-branch to the head.

src/BTrees/tests/testBTrees.py

@@ -612,7 +612,7 @@ class BTreeTests(MappingBase):
                 del self.t[k]
                 deleted.append(k)
                 if self.t.has_key(k):
-                    raise "had problems deleting %s" % k
+                    self.fail( "had problems deleting %s" % k )
         badones = []
         for x in deleted:
             if self.t.has_key(x):

src/ZODB/ConflictResolution.py

@@ -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
@@ -47,7 +48,7 @@ class PersistentReference:
         return "PR(%s %s)" % (id(self), self.data)
 
     def __getstate__(self):
-        raise "Can't pickle PersistentReference"
+        raise PicklingError, "Can't pickle PersistentReference"
 
 class PersistentReferenceFactory:
 

src/ZODB/DB.py

@@ -13,8 +13,8 @@
 ##############################################################################
 """Database objects
 
-$Id: DB.py,v 1.55 2003/10/02 18:17:19 jeremy Exp $"""
-__version__='$Revision: 1.55 $'[11:-2]
+$Id: DB.py,v 1.56 2003/11/18 13:17:16 tseaver Exp $"""
+__version__='$Revision: 1.56 $'[11:-2]
 
 import cPickle, cStringIO, sys, POSException, UndoLogCompatible
 from Connection import Connection
@@ -277,7 +277,7 @@ class DB(UndoLogCompatible.UndoLogCompatible, object):
         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 @@ class DB(UndoLogCompatible.UndoLogCompatible, object):
         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):

src/ZODB/Mount.py

@@ -13,8 +13,8 @@
 ##############################################################################
 """Mounted database support
 
-$Id: Mount.py,v 1.19 2003/02/06 20:31:17 shane Exp $"""
-__version__='$Revision: 1.19 $'[11:-2]
+$Id: Mount.py,v 1.20 2003/11/18 13:17:16 tseaver Exp $"""
+__version__='$Revision: 1.20 $'[11:-2]
 
 import thread, Persistence, Acquisition
 from Acquisition import aq_base
@@ -88,7 +88,7 @@ class MountPoint(Persistence.Persistent, Acquisition.Implicit):
         '''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.

src/ZODB/tests/testTransaction.py

@@ -14,7 +14,7 @@
 
 """
 Revision information:
-$Id: testTransaction.py,v 1.14 2003/10/05 14:34:35 chrism Exp $
+$Id: testTransaction.py,v 1.15 2003/11/18 13:17:16 tseaver Exp $
 """
 
 """
@@ -521,7 +521,7 @@ class TransactionTests(unittest.TestCase):
         except Transaction.POSException.TransactionError:
             pass
         else:
-            raise "Hosed Application didn't stop commits"
+            self.fail("Hosed Application didn't stop commits")
 
 
 class DataObject: