[Zope-Checkins] CVS: Zope2 - Catalog.py:1.69

[chrism@serenade.digicool.com]

Update of /cvs-repository/Zope2/lib/python/Products/ZCatalog
In directory serenade.digicool.com:/home/chrism/sandboxes/testtrunk/lib/python/Products/ZCatalog

Modified Files:
	Catalog.py 
Log Message:
Merged delete-from kw-mapping fix into trunk.


--- Updated File Catalog.py in package Zope2 --
--- Catalog.py	2001/04/17 17:07:34	1.68
+++ Catalog.py	2001/04/19 17:08:24	1.69
@@ -635,12 +635,10 @@
         # Compute "sort_index", which is a sort index, or none:
         if kw.has_key('sort-on'):
             sort_index=kw['sort-on']
-            del kw['sort-on']
         elif hasattr(self, 'sort-on'):
             sort_index=getattr(self, 'sort-on')
         elif kw.has_key('sort_on'):
             sort_index=kw['sort_on']
-            del kw['sort_on']
         else: sort_index=None
         sort_order=''
         if sort_index is not None: