Update of /cvs-repository/Products/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv19326/CMFDefault
Modified Files:
DEPENDENCIES.txt Document.py Link.py
Log Message:
- Merge tseaver-z28_only-branch, removing BBB for Zope 2.7 support.
=== Products/CMFDefault/DEPENDENCIES.txt 1.3 => 1.4 ===
--- Products/CMFDefault/DEPENDENCIES.txt:1.3 Thu Nov 18 13:18:53 2004
+++ Products/CMFDefault/DEPENDENCIES.txt Wed Jun 15 10:17:38 2005
@@ -1,4 +1,4 @@
-Zope >= 2.7.0
+Zope >= 2.8.0
CMFCore
CMFSetup
CMFTopic
=== Products/CMFDefault/Document.py 1.75 => 1.76 ===
--- Products/CMFDefault/Document.py:1.75 Thu May 26 11:30:29 2005
+++ Products/CMFDefault/Document.py Wed Jun 15 10:17:38 2005
@@ -22,11 +22,7 @@
from Globals import DTMLFile
from Globals import InitializeClass
from StructuredText.StructuredText import HTML
-try:
- import transaction
-except ImportError:
- # BBB: for Zope 2.7
- from Products.CMFCore.utils import transaction
+import transaction
from Products.CMFCore.PortalContent import PortalContent
from Products.CMFCore.utils import contributorsplitter
=== Products/CMFDefault/Link.py 1.35 => 1.36 ===
--- Products/CMFDefault/Link.py:1.35 Tue Apr 5 06:48:44 2005
+++ Products/CMFDefault/Link.py Wed Jun 15 10:17:38 2005
@@ -20,11 +20,7 @@
from AccessControl import ClassSecurityInfo
from Globals import DTMLFile
from Globals import InitializeClass
-try:
- import transaction
-except ImportError:
- # BBB: for Zope 2.7
- from Products.CMFCore.utils import transaction
+import transaction
from Products.CMFCore.PortalContent import PortalContent
from Products.CMFCore.utils import contributorsplitter
_______________________________________________
CMF-checkins mailing list
[email protected]
http://mail.zope.org/mailman/listinfo/cmf-checkins
