[Zope-Checkins] SVN: Zope/branches/tim-2.9-windows-installer/ - Wrong branch

[Sidnei da Silva]

Log message for revision 41396:
  
  - Wrong branch
  

Changed:
  U   Zope/branches/tim-2.9-windows-installer/doc/CHANGES.txt
  U   Zope/branches/tim-2.9-windows-installer/lib/python/OFS/ObjectManager.py

-=-
Modified: Zope/branches/tim-2.9-windows-installer/doc/CHANGES.txt
===================================================================
--- Zope/branches/tim-2.9-windows-installer/doc/CHANGES.txt	2006-01-21 14:24:58 UTC (rev 41395)
+++ Zope/branches/tim-2.9-windows-installer/doc/CHANGES.txt	2006-01-21 14:46:19 UTC (rev 41396)
@@ -22,11 +22,6 @@
 
    - Collector #1233: port ZOPE_CONFIG patch from Zope 2.7 to Zope 2.8
 
-  after Zope 2.9.0
-
-      - Collector #2002: fixed broken 'ls -R' functionality (didn't
-        recurse properly subclasses of OFS.Folder)
-
   Zope 2.9.0 (2006/01/09)
 
     Bugs fixed

Modified: Zope/branches/tim-2.9-windows-installer/lib/python/OFS/ObjectManager.py
===================================================================
--- Zope/branches/tim-2.9-windows-installer/lib/python/OFS/ObjectManager.py	2006-01-21 14:24:58 UTC (rev 41395)
+++ Zope/branches/tim-2.9-windows-installer/lib/python/OFS/ObjectManager.py	2006-01-21 14:46:19 UTC (rev 41396)
@@ -524,7 +524,7 @@
             obj_ids.sort()
             for id in obj_ids:
                 o=self._getOb(id)
-                if hasattr(aq_base(o), 'isPrincipiaFolderish') and \
+                if hasattr(o, 'isPrincipiaFolderish') and \
                    o.isPrincipiaFolderish:
                     r.append(o)
         return r
@@ -641,7 +641,7 @@
                 break
             ob=ob.aq_parent
 
-        files = list(self.objectItems())
+        files=self.objectItems()
 
         # recursive ride through all subfolders (ls -R) (ajung)
 
@@ -649,10 +649,15 @@
 
             all_files = copy.copy(files)
             for f in files:
-                if hasattr(aq_base(f[1]), 'isPrincipiaFolderish') and f[1].isPrincipiaFolderish:
+                if f[1].meta_type == "Folder":
                     all_files.extend(findChildren(f[1]))
+                else:
+                    all_files.append(f)
+
             files = all_files
 
+        files = list(files)
+
         # Perform globbing on list of files (ajung)
 
         globbing = REQUEST.environ.get('GLOBBING','')
@@ -730,12 +735,12 @@
     find all children of an object (ajung)
     """
 
-    lst = []
-    for name, child in obj.objectItems():
-        if hasattr(aq_base(child), 'isPrincipiaFolderish') and child.isPrincipiaFolderish:
-            lst.extend(findChildren(child, dirname + obj.id + '/'))
+    lst =[]
+    for name,child in obj.objectItems():
+        if child.meta_type=="Folder":
+            lst.extend(findChildren(child,dirname+ obj.id + '/'))
         else:
-            lst.append((dirname + obj.id + "/" + name, child))
+            lst.append( (dirname + obj.id + "/" + name,child) )
 
     return lst