[Checkins] SVN: Products.BTreeFolder2/trunk/ Merge icemac-ease_ordered_btree branch

[Hanno Schlichting]

Log message for revision 120799:
  Merge icemac-ease_ordered_btree branch
  

Changed:
  U   Products.BTreeFolder2/trunk/CHANGES.txt
  U   Products.BTreeFolder2/trunk/src/Products/BTreeFolder2/BTreeFolder2.py

-=-
Modified: Products.BTreeFolder2/trunk/CHANGES.txt
===================================================================
--- Products.BTreeFolder2/trunk/CHANGES.txt	2011-03-08 10:57:51 UTC (rev 120798)
+++ Products.BTreeFolder2/trunk/CHANGES.txt	2011-03-08 12:30:06 UTC (rev 120799)
@@ -4,6 +4,8 @@
 2.13.2 (unreleased)
 -------------------
 
+- `objectValues` and `objectItems` no longer do a special handling when no
+  special `spec` is requested as `objectIds` already does the correct handling.
 
 2.13.1 (2010-08-04)
 -------------------

Modified: Products.BTreeFolder2/trunk/src/Products/BTreeFolder2/BTreeFolder2.py
===================================================================
--- Products.BTreeFolder2/trunk/src/Products/BTreeFolder2/BTreeFolder2.py	2011-03-08 10:57:51 UTC (rev 120798)
+++ Products.BTreeFolder2/trunk/src/Products/BTreeFolder2/BTreeFolder2.py	2011-03-08 12:30:06 UTC (rev 120799)
@@ -384,8 +384,6 @@
         # Returns a list of actual subobjects of the current object.
         # If 'spec' is specified, returns only objects whose meta_type
         # match 'spec'.
-        if spec is None:
-            return LazyMap(self._getOb, self._tree.keys())
         return LazyMap(self._getOb, self.objectIds(spec))
 
     security.declareProtected(access_contents_information, 'values')
@@ -397,9 +395,6 @@
         # Returns a list of (id, subobject) tuples of the current object.
         # If 'spec' is specified, returns only objects whose meta_type match
         # 'spec'
-        if spec is None:
-            return LazyMap(lambda id, _getOb=self._getOb: (id, _getOb(id)),
-                           self._tree.keys())
         return LazyMap(lambda id, _getOb=self._getOb: (id, _getOb(id)),
                        self.objectIds(spec))