[Zope-Checkins] CVS: Zope/lib/python/Products/ZCatalog - Catalog.py:1.98.6.9

[Casey Duncan]

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

Modified Files:
      Tag: Zope-2_6-branch
	Catalog.py 
Log Message:
Remove unused import
Fix bare except


=== Zope/lib/python/Products/ZCatalog/Catalog.py 1.98.6.8 => 1.98.6.9 ===
--- Zope/lib/python/Products/ZCatalog/Catalog.py:1.98.6.8	Tue Feb  4 11:34:40 2003
+++ Zope/lib/python/Products/ZCatalog/Catalog.py	Tue May 27 00:02:09 2003
@@ -14,7 +14,6 @@
 from Persistence import Persistent
 import Acquisition
 import ExtensionClass
-from Products.PluginIndexes.TextIndex.Lexicon import Lexicon
 from MultiMapping import MultiMapping
 import Record
 from Missing import MV
@@ -36,8 +35,7 @@
 
 try:
     from DocumentTemplate.cDocumentTemplate import safe_callable
-except:
-
+except ImportError:
     def safe_callable(ob):
         # Works with ExtensionClasses and Acquisition.
         if hasattr(ob, '__class__'):
@@ -798,3 +796,5 @@
         if reverse:
             all.reverse()
         return LazyMap(lambda rec: rec[2](rec[1]), all, len(all))
+        
+