[CMF-checkins] CVS: CMF/CMFCore - utils.py:1.47
Yvo Schubbe
schubbe at web.de
Tue Jan 6 03:52:01 EST 2004
Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv23213/CMFCore
Modified Files:
utils.py
Log Message:
- removed Zope 2.4 compatibility code
=== CMF/CMFCore/utils.py 1.46 => 1.47 ===
--- CMF/CMFCore/utils.py:1.46 Sun Dec 7 15:44:05 2003
+++ CMF/CMFCore/utils.py Tue Jan 6 03:52:00 2004
@@ -20,17 +20,6 @@
import re
from types import StringType
-from Globals import package_home
-from Globals import HTMLFile
-from Globals import ImageFile
-from Globals import InitializeClass
-from Globals import MessageDialog
-try:
- from Globals import UNIQUE
-except ImportError:
- # for Zope versions before 2.5.0
- from OFS.ObjectManager import UNIQUE
-
from AccessControl import ClassSecurityInfo
from AccessControl import getSecurityManager
from AccessControl import ModuleSecurityInfo
@@ -39,6 +28,12 @@
from AccessControl.Role import gather_permissions
from Acquisition import aq_get, aq_inner, aq_parent
from ExtensionClass import Base
+from Globals import HTMLFile
+from Globals import ImageFile
+from Globals import InitializeClass
+from Globals import MessageDialog
+from Globals import package_home
+from Globals import UNIQUE
from OFS.misc_ import misc_ as misc_images
from OFS.misc_ import Misc_ as MiscImage
from OFS.PropertyManager import PropertyManager
More information about the CMF-checkins
mailing list