Made CMFBTreeFolder compatible with CMF 1.5

doc/CHANGES.txt

@@ -36,6 +36,8 @@ Zope Changes
 
     Bugs Fixed
 
+      - Fixed CMFBTreeFolder for CMF 1.5+
+
       - Collector #1548: Fix 'httplib' usage in ZPublisher.Client.
 
       - Collector #1808: manage_convertIndexes no longer tries to change the

lib/python/Products/BTreeFolder2/CHANGES.txt

+Version 1.0.2
+
+  - Made CMFBTreeFolder compatible with CMF 1.5+
+
 Version 1.0.1
 
   - ConflictError was swallowed by _delObject. This could break code

lib/python/Products/BTreeFolder2/CMFBTreeFolder.py

@@ -18,7 +18,10 @@ $Id: CMFBTreeFolder.py,v 1.2 2002/10/30 14:54:18 shane Exp $
 
 import Globals
 from BTreeFolder2 import BTreeFolder2Base
-from Products.CMFCore.PortalFolder import PortalFolder
+try:
+    from Products.CMFCore.PortalFolder import PortalFolderBase as PortalFolder
+except ImportError:
+    from Products.CMFCore.PortalFolder import PortalFolder
 import Products.CMFCore.PortalFolder
 
 

lib/python/Products/BTreeFolder2/version.txt

-BTreeFolder2-1.0.1
+BTreeFolder2-1.0.2