[CMF-checkins] SVN: CMF/trunk/CMF import directly from GenericSetup

[Yvo Schubbe]

Log message for revision 38702:
  import directly from GenericSetup

Changed:
  U   CMF/trunk/CMFCalendar/__init__.py
  U   CMF/trunk/CMFDefault/__init__.py
  U   CMF/trunk/CMFUid/__init__.py

-=-
Modified: CMF/trunk/CMFCalendar/__init__.py
===================================================================
--- CMF/trunk/CMFCalendar/__init__.py	2005-09-30 11:45:36 UTC (rev 38701)
+++ CMF/trunk/CMFCalendar/__init__.py	2005-09-30 12:03:12 UTC (rev 38702)
@@ -20,8 +20,8 @@
 import utils
 from Products.CMFCore import utils
 from Products.CMFCore.DirectoryView import registerDirectory
-from Products.CMFSetup import EXTENSION
-from Products.CMFSetup import profile_registry
+from Products.GenericSetup import EXTENSION
+from Products.GenericSetup import profile_registry
 
 import Event
 import CalendarTool

Modified: CMF/trunk/CMFDefault/__init__.py
===================================================================
--- CMF/trunk/CMFDefault/__init__.py	2005-09-30 11:45:36 UTC (rev 38701)
+++ CMF/trunk/CMFDefault/__init__.py	2005-09-30 12:03:12 UTC (rev 38702)
@@ -21,9 +21,9 @@
 from Products.CMFCore.utils import ToolInit
 from Products.CMFCore.utils import ContentInit
 from Products.CMFCore.utils import registerIcon
-from Products.CMFSetup import BASE
-from Products.CMFSetup import EXTENSION
-from Products.CMFSetup import profile_registry
+from Products.GenericSetup import BASE
+from Products.GenericSetup import EXTENSION
+from Products.GenericSetup import profile_registry
 
 import factory
 import utils

Modified: CMF/trunk/CMFUid/__init__.py
===================================================================
--- CMF/trunk/CMFUid/__init__.py	2005-09-30 11:45:36 UTC (rev 38701)
+++ CMF/trunk/CMFUid/__init__.py	2005-09-30 12:03:12 UTC (rev 38702)
@@ -18,8 +18,8 @@
 from sys import modules
 
 from Products.CMFCore import utils
-from Products.CMFSetup import EXTENSION
-from Products.CMFSetup import profile_registry
+from Products.GenericSetup import EXTENSION
+from Products.GenericSetup import profile_registry
 
 import UniqueIdAnnotationTool
 import UniqueIdGeneratorTool