[Checkins] SVN: Products.BTreeFolder2/trunk/src/Products/BTreeFolder2/BTreeFolder2.py Group similar methods together

[Hanno Schlichting]

Log message for revision 114593:
  Group similar methods together
  

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

-=-
Modified: Products.BTreeFolder2/trunk/src/Products/BTreeFolder2/BTreeFolder2.py
===================================================================
--- Products.BTreeFolder2/trunk/src/Products/BTreeFolder2/BTreeFolder2.py	2010-07-11 13:04:40 UTC (rev 114592)
+++ Products.BTreeFolder2/trunk/src/Products/BTreeFolder2/BTreeFolder2.py	2010-07-11 13:08:18 UTC (rev 114593)
@@ -97,6 +97,10 @@
     _mt_index = None  # OOBTree: { meta_type -> OIBTree: { id -> 1 } }
     title = ''
 
+    # superValues() looks for the _objects attribute, but the implementation
+    # would be inefficient, so superValues() support is disabled.
+    _objects = ()
+
     def __init__(self, id=None):
         if id is not None:
             self.id = id
@@ -215,6 +219,23 @@
             else:
                 return ob.__of__(self)
 
+    security.declareProtected(access_contents_information, 'get')
+    def get(self, name, default=None):
+        return self._getOb(name, default)
+
+    def __getitem__(self, name):
+        return self._getOb(name)
+
+    def __getattr__(self, name):
+        # Boo hoo hoo!  Zope 2 prefers implicit acquisition over traversal
+        # to subitems, and __bobo_traverse__ hooks don't work with
+        # restrictedTraverse() unless __getattr__() is also present.
+        # Oh well.
+        res = self._tree.get(name)
+        if res is None:
+            raise AttributeError(name)
+        return res
+
     def _setOb(self, id, object):
         """Store the named object in the folder.
         """
@@ -299,8 +320,7 @@
         else:
             return self.manage_main(self, REQUEST)
 
-    security.declareProtected(access_contents_information,
-                              'tpValues')
+    security.declareProtected(access_contents_information, 'tpValues')
     def tpValues(self):
         """Ensures the items don't show up in the left pane.
         """
@@ -323,6 +343,9 @@
         """
         return id in self._tree
 
+    # backward compatibility
+    hasObject = has_key
+
     security.declareProtected(access_contents_information, 'objectIds')
     def objectIds(self, spec=None):
         # Returns a list of subobject ids of the current object.
@@ -390,10 +413,6 @@
                        {'id': k, 'meta_type': getattr(v, 'meta_type', None)},
                        self._tree.items(), self._count())
 
-    # superValues() looks for the _objects attribute, but the implementation
-    # would be inefficient, so superValues() support is disabled.
-    _objects = ()
-
     security.declareProtected(access_contents_information, 'objectIds_d')
     def objectIds_d(self, t=None):
         ids = self.objectIds(t)
@@ -470,16 +489,6 @@
     def __delitem__(self, name):
         return self._delObject(id=name)
 
-    # backward compatibility
-    hasObject = has_key
-
-    security.declareProtected(access_contents_information, 'get')
-    def get(self, name, default=None):
-        return self._getOb(name, default)
-
-    def __getitem__(self, name):
-        return self._getOb(name)
-
     # Utility for generating unique IDs.
 
     security.declareProtected(access_contents_information, 'generateId')
@@ -506,17 +515,6 @@
         self._v_nextid = n + 1
         return id
 
-    def __getattr__(self, name):
-        # Boo hoo hoo!  Zope 2 prefers implicit acquisition over traversal
-        # to subitems, and __bobo_traverse__ hooks don't work with
-        # restrictedTraverse() unless __getattr__() is also present.
-        # Oh well.
-        res = self._tree.get(name)
-        if res is None:
-            raise AttributeError(name)
-        return res
-
-
 InitializeClass(BTreeFolder2Base)