- Merge tseaver-strexp_delenda-branch to the head.

Catalog.py

@@ -42,6 +42,9 @@ def safe_callable(ob):
             return callable(ob)
 
 
+class CatalogError(Exception):
+    pass
+
 class Catalog(Persistent, Acquisition.Implicit, ExtensionClass.Base):
     """ An Object Catalog 
 
@@ -182,10 +185,10 @@ def addColumn(self, name, default_value=None):
         names = list(self.names)
 
         if schema.has_key(name):
-            raise 'Column Exists', 'The column exists'
+            raise CatalogError, 'The column %s already exists' % name
 
         if name[0] == '_':
-            raise 'Invalid Meta-Data Name', \
+            raise CatalogError, \
                   'Cannot cache fields beginning with "_"'
 
         if not schema.has_key(name):
@@ -255,13 +258,13 @@ def addIndex(self, name, index_type):
         """
 
         if self.indexes.has_key(name):
-            raise 'Index Exists', 'The index specified already exists'
+            raise CatalogError, 'The index %s already exists' % name
 
         if name.startswith('_'):
-            raise 'Invalid Index Name', 'Cannot index fields beginning with "_"'
+            raise CatalogError, 'Cannot index fields beginning with "_"'
 
         if not name:
-            raise 'Invalid Index Name', 'Name of index is empty'
+            raise CatalogError, 'Name of index is empty'
 
         indexes = self.indexes
 
@@ -277,7 +280,7 @@ def delIndex(self, name):
         """ deletes an index """
 
         if not self.indexes.has_key(name):
-            raise 'No Index', 'The index specified does not exist'
+            raise CatalogError, 'The index %s does not exist' % name
 
         indexes = self.indexes
         del indexes[name]
@@ -754,8 +757,6 @@ def searchResults(self, REQUEST=None, used=None, _merge=1, **kw):
     __call__ = searchResults
 
 
-class CatalogError(Exception): pass
-
 class CatalogSearchArgumentsMap:
     """Multimap catalog arguments coming simultaneously from keywords
     and request.

regressiontests/regressionCatalogTiming.py

@@ -217,7 +217,9 @@ def main():
                 f = h.getfile()
                 data = f.read()
                 print data
-                raise "Error reading from host %s" % server
+                class HTTPRequestError(Exception):
+                    pass
+                raise HTTPRequestError, "Error reading from host %s" % server
             f = h.getfile()
             out=open(mb,'w')
             print "this is going to take a while..."

tests/testCatalog.py

@@ -76,12 +76,8 @@ def testAdd(self):
                          'add column failed')
 
     def testAddBad(self):
-        try:
-            self._catalog.addColumn('_id')
-        except:
-            pass
-        else:
-            raise 'invalid metadata column check failed'
+        from Products.ZCatalog.Catalog import CatalogError
+        self.assertRaises(CatalogError, self._catalog.addColumn, '_id')
 
     def testDel(self):
         self._catalog.addColumn('id')