[Checkins] SVN: Products.BTreeFolder2/trunk/ Be more careful in calling our own keys, values and items methods, as sub-classes might have overridden some of them.
Hanno Schlichting
hannosch at hannosch.eu
Mon Aug 2 18:40:30 EDT 2010
Log message for revision 115393:
Be more careful in calling our own keys, values and items methods, as sub-classes might have overridden some of them.
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 2010-08-02 21:51:02 UTC (rev 115392)
+++ Products.BTreeFolder2/trunk/CHANGES.txt 2010-08-02 22:40:29 UTC (rev 115393)
@@ -4,6 +4,8 @@
2.13.1 (unreleased)
-------------------
+- Be more careful in calling our own keys, values and items methods, as
+ sub-classes might have overridden some of them.
2.13.0 (2010-07-11)
-------------------
Modified: Products.BTreeFolder2/trunk/src/Products/BTreeFolder2/BTreeFolder2.py
===================================================================
--- Products.BTreeFolder2/trunk/src/Products/BTreeFolder2/BTreeFolder2.py 2010-08-02 21:51:02 UTC (rev 115392)
+++ Products.BTreeFolder2/trunk/src/Products/BTreeFolder2/BTreeFolder2.py 2010-08-02 22:40:29 UTC (rev 115393)
@@ -353,7 +353,7 @@
# matches 'spec'.
if spec is None:
- return self.keys()
+ return self._tree.keys()
if isinstance(spec, str):
spec = [spec]
@@ -385,7 +385,7 @@
# If 'spec' is specified, returns only objects whose meta_type
# match 'spec'.
if spec is None:
- return self.values()
+ return self._tree.values()
return LazyMap(self._getOb, self.objectIds(spec))
security.declareProtected(access_contents_information, 'values')
@@ -398,7 +398,7 @@
# If 'spec' is specified, returns only objects whose meta_type match
# 'spec'
if spec is None:
- return self.items()
+ return self._tree.items()
return LazyMap(lambda id, _getOb=self._getOb: (id, _getOb(id)),
self.objectIds(spec))
More information about the checkins
mailing list