[Erp5-report] r17598 - /erp5/trunk/products/ERP5Form/SelectionTool.py

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Nov 14 20:26:34 2007
New Revision: 17598

URL: http://svn.erp5.org?rev=17598&view=rev
Log:
adapt conflict resolution code for zope 2.8

Modified:
    erp5/trunk/products/ERP5Form/SelectionTool.py

Modified: erp5/trunk/products/ERP5Form/SelectionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/SelectionTool.py?rev=17598&r1=17597&r2=17598&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/SelectionTool.py (original)
+++ erp5/trunk/products/ERP5Form/SelectionTool.py Wed Nov 14 20:26:34 2007
@@ -1422,11 +1422,11 @@
     # update keys that only savedState has
     oldState = newState
     # dict returned by PersistentMapping.__getstate__ contains the data
-    # under _container key, so only compare this key (this is coupled with
-    # PersistentMapping implementation, but this implementation is lot likely
-    # to change, because it would break existing pickles).
-    oldState['_container'].update(savedState['_container'])
-
+    # under '_container' key in zope 2.7 and 'data' in zope 2.8
+    if 'data' in state:
+      oldState['data'].update(savedState['data'])
+    else:
+      oldState['_container'].update(savedState['_container'])
     return oldState