[Zope-Checkins] CVS: Zope/lib/python/Products/ZCatalog/regressiontests - regressionCatalogTiming.py:1.5

[Tres Seaver]

Update of /cvs-repository/Zope/lib/python/Products/ZCatalog/regressiontests
In directory cvs.zope.org:/tmp/cvs-serv30559/lib/python/Products/ZCatalog/regressiontests

Modified Files:
	regressionCatalogTiming.py 
Log Message:
 - Merge tseaver-strexp_delenda-branch to the head.


=== Zope/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.py 1.4 => 1.5 ===
--- Zope/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.py:1.4	Wed Aug 14 18:25:16 2002
+++ Zope/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.py	Tue Nov 18 08:17:10 2003
@@ -217,7 +217,9 @@
                 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..."