Update of /cvs-repository/Products/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv19326/CMFCore
Modified Files:
CMFCatalogAware.py DEPENDENCIES.txt utils.py
Log Message:
- Merge tseaver-z28_only-branch, removing BBB for Zope 2.7 support.
=== Products/CMFCore/CMFCatalogAware.py 1.30 => 1.31 ===
--- Products/CMFCore/CMFCatalogAware.py:1.30 Fri Jun 3 13:31:33 2005
+++ Products/CMFCore/CMFCatalogAware.py Wed Jun 15 10:17:37 2005
@@ -94,11 +94,7 @@
if brain_path == path:
continue
# Get the object
- if hasattr(aq_base(brain), '_unrestrictedGetObject'):
- ob = brain._unrestrictedGetObject()
- else:
- # BBB older Zope
- ob = self.unrestrictedTraverse(brain_path, None)
+ ob = brain._unrestrictedGetObject()
if ob is None:
# Ignore old references to deleted objects.
LOG('reindexObjectSecurity', PROBLEM,
=== Products/CMFCore/DEPENDENCIES.txt 1.2 => 1.3 ===
--- Products/CMFCore/DEPENDENCIES.txt:1.2 Tue Jun 1 06:36:52 2004
+++ Products/CMFCore/DEPENDENCIES.txt Wed Jun 15 10:17:37 2005
@@ -1 +1 @@
-Zope >= 2.7.0
+Zope >= 2.8.0
=== Products/CMFCore/utils.py 1.67 => 1.68 ===
--- Products/CMFCore/utils.py:1.67 Thu Apr 7 12:38:46 2005
+++ Products/CMFCore/utils.py Wed Jun 15 10:17:37 2005
@@ -643,18 +643,3 @@
def __init__(self, **kw):
self.__dict__.update(kw)
-
-
-# BBB: for Zope 2.7
-class BBBTransaction:
-
- def begin(self):
- get_transaction().begin()
-
- def commit(self, sub=False):
- get_transaction().commit(sub)
-
- def abort(self, sub=False):
- get_transaction().abort(sub)
-
-transaction = BBBTransaction()
_______________________________________________
CMF-checkins mailing list
[email protected]
http://mail.zope.org/mailman/listinfo/cmf-checkins
