[Zope-CVS] CVS: Products/GenericSetup - CHANGES.txt:1.2 tool.py:1.2 utils.py:1.2 version.txt:1.3

[Tres Seaver]

Update of /cvs-repository/Products/GenericSetup
In directory cvs.zope.org:/tmp/cvs-serv19329

Modified Files:
	CHANGES.txt tool.py utils.py version.txt 
Log Message:
 - Forward-port fixes from CMFSetup.


=== Products/GenericSetup/CHANGES.txt 1.1 => 1.2 ===
--- Products/GenericSetup/CHANGES.txt:1.1	Thu Aug 11 17:41:36 2005
+++ Products/GenericSetup/CHANGES.txt	Fri Sep 23 13:29:20 2005
@@ -1,11 +1,20 @@
-GenericSetup-0.10 (2005/08/11)
+GenericSetup Product Changelog
 
-  - CVS tag:  GenericSetup-0_10
+  After GenericSetup-0.10
 
-  - Added TarballImportContext, including full test suite.
+    - Forward ported BBB # old instances that stored properties as
+      lists from CMFSetup.
 
-GenericSetup-0.9 (2005/08/08)
+    - Forward ported fix for tools with non unique IDs from CMFSetup.
 
-  - CVS tag:  GenericSetup-0_9
+  GenericSetup 0.10 (2005/08/11)
 
-  - Initial version, cut down from CMFSetup-1.5.3
+    - CVS tag:  GenericSetup-0_10
+
+    - Added TarballImportContext, including full test suite.
+
+  GenericSetup 0.9 (2005/08/08)
+
+    - CVS tag:  GenericSetup-0_9
+
+    - Initial version, cut down from CMFSetup-1.5.3


=== Products/GenericSetup/tool.py 1.1.1.1 => 1.2 ===
--- Products/GenericSetup/tool.py:1.1.1.1	Mon Aug  8 15:38:37 2005
+++ Products/GenericSetup/tool.py	Fri Sep 23 13:29:20 2005
@@ -91,11 +91,16 @@
         tool_id = str(info['id'])
         tool_class = _resolveDottedName(info['class'])
 
-        #existing = getToolByName(site, tool_id, None)
         existing = getattr(site, tool_id, None)
+        new_tool = tool_class()
+
+        try:
+            new_tool._setId(tool_id)
+        except: # XXX:  ImmutableId raises result of calling MessageDialog
+            pass
 
         if existing is None:
-            site._setObject(tool_id, tool_class())
+            site._setObject(tool_id, new_tool)
 
         else:
             unwrapped = aq_base(existing)


=== Products/GenericSetup/utils.py 1.1.1.1 => 1.2 ===
--- Products/GenericSetup/utils.py:1.1.1.1	Mon Aug  8 15:38:37 2005
+++ Products/GenericSetup/utils.py	Fri Sep 23 13:29:20 2005
@@ -374,6 +374,11 @@
         if isinstance(prop, tuple):
             prop_value = ''
             prop_elements = prop
+        elif isinstance(prop, list):
+            # Backward compat for old instances that stored
+            # properties as list.
+            prop_value = ''
+            prop_elements = tuple(prop)
         else:
             prop_value = prop
             prop_elements = ()


=== Products/GenericSetup/version.txt 1.2 => 1.3 ===
--- Products/GenericSetup/version.txt:1.2	Thu Aug 11 17:41:36 2005
+++ Products/GenericSetup/version.txt	Fri Sep 23 13:29:20 2005
@@ -1 +1 @@
-GenericSetup-0.10
+GenericSetup-0.10+