[CMF-checkins] CVS: Products/CMFDefault - __init__.py:1.24.2.2 exceptions.py:1.4.2.1 setuphandlers.py:1.2.2.3

[Yvo Schubbe]

Update of /cvs-repository/Products/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv8223/CMFDefault

Modified Files:
      Tag: CMF-1_5-branch
	__init__.py exceptions.py setuphandlers.py 
Log Message:
backported recent CMFSetup changes from HEAD to CMF-1_5-branch


=== Products/CMFDefault/__init__.py 1.24.2.1 => 1.24.2.2 ===
--- Products/CMFDefault/__init__.py:1.24.2.1	Sun Nov 28 15:05:54 2004
+++ Products/CMFDefault/__init__.py	Tue Apr  5 11:17:16 2005
@@ -22,6 +22,7 @@
 from Products.CMFCore.utils import ContentInit
 from Products.CMFCore.utils import registerIcon
 try:
+    from Products.CMFSetup import BASE
     from Products.CMFSetup import profile_registry
     has_profile_registry = True
 except ImportError:
@@ -150,7 +151,8 @@
                                          'CMFDefault Site',
                                          'Profile for a default CMFSite.',
                                          'profiles/default',
-                                         'CMFDefault')
+                                         'CMFDefault',
+                                         BASE)
 
     context.registerClass( Portal.CMFSite
                          , constructors=( Portal.manage_addCMFSiteForm


=== Products/CMFDefault/exceptions.py 1.4 => 1.4.2.1 ===
--- Products/CMFDefault/exceptions.py:1.4	Thu Aug 12 11:07:40 2004
+++ Products/CMFDefault/exceptions.py	Tue Apr  5 11:17:16 2005
@@ -21,6 +21,9 @@
 security.declarePublic('AccessControl_Unauthorized')
 from Products.CMFCore.exceptions import AccessControl_Unauthorized
 
+security.declarePublic('BadRequest')
+from Products.CMFCore.exceptions import BadRequest
+
 security.declarePublic('CopyError')
 from Products.CMFCore.exceptions import CopyError
 


=== Products/CMFDefault/setuphandlers.py 1.2.2.2 => 1.2.2.3 ===
--- Products/CMFDefault/setuphandlers.py:1.2.2.2	Fri Dec 17 12:49:40 2004
+++ Products/CMFDefault/setuphandlers.py	Tue Apr  5 11:17:16 2005
@@ -17,6 +17,7 @@
 
 from Products.CMFCore.utils import getToolByName
 
+from exceptions import BadRequest
 from Portal import PortalGenerator
 
 
@@ -28,19 +29,12 @@
     """
     site = context.getSite()
 
-    # try to install CMFUid without raising exceptions if not available
-    try:
-        addCMFUidTool = site.manage_addProduct['CMFUid'].manage_addTool
-    except AttributeError:
-        pass
-    else:
-        addCMFUidTool('Unique Id Annotation Tool', None)
-        addCMFUidTool('Unique Id Generator Tool', None)
-        addCMFUidTool('Unique Id Handler Tool', None)
-
     # add custom skin folder
     stool = getToolByName(site, 'portal_skins')
-    stool.manage_addProduct['OFSP'].manage_addFolder(id='custom')
+    try:
+        stool.manage_addProduct['OFSP'].manage_addFolder(id='custom')
+    except BadRequest:
+        return 'Various settings: Nothing to import.'
 
     gen = PortalGenerator()
     gen.setupMailHost(site)