[Zope-Checkins] CVS: Products/ZCatalog - Catalog.py:1.111.2.6.6.2

[Andreas Jung]

Update of /cvs-repository/Products/ZCatalog
In directory cvs.zope.org:/tmp/cvs-serv24143

Modified Files:
      Tag: ajung-catalog__len__-migration-branch
	Catalog.py 
Log Message:
ups..the former commit had no comment and a bug:

- removed old conversion code
- replaced __len__ attribute with _length attribute to avoid
  conflicts with a cached __len__ slot
- some cleanup


=== Products/ZCatalog/Catalog.py 1.111.2.6.6.1 => 1.111.2.6.6.2 ===
--- Products/ZCatalog/Catalog.py:1.111.2.6.6.1	Sat Oct  9 08:05:30 2004
+++ Products/ZCatalog/Catalog.py	Sat Oct  9 08:07:01 2004
@@ -106,7 +106,7 @@
         Returns instances of self._v_brains, or whatever is passed
         into self.useBrains.
         """
-        if isinstance(index, TupleType):
+        if isinstance(index, tuple):
             # then it contains a score...
             normalized_score, score, key = index
             r=self._v_result_class(self.data[key]).__of__(self.aq_parent)