[Neo-report] r2017 vincent - /trunk/neo/client/app.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Apr 23 17:20:42 CEST 2010
Author: vincent
Date: Fri Apr 23 17:20:42 2010
New Revision: 2017
Log:
Factorise some local_var lookups.
Modified:
trunk/neo/client/app.py
Modified: trunk/neo/client/app.py
==============================================================================
--- trunk/neo/client/app.py [iso-8859-1] (original)
+++ trunk/neo/client/app.py [iso-8859-1] Fri Apr 23 17:20:42 2010
@@ -598,7 +598,9 @@
# Check for conflicts
data_dict = local_var.data_dict
object_serial_dict = local_var.object_serial_dict
- for oid, conflict_serial in local_var.conflict_serial_dict.items():
+ conflict_serial_dict = local_var.conflict_serial_dict
+ resolved_conflict_serial_dict = local_var.resolved_conflict_serial_dict
+ for oid, conflict_serial in conflict_serial_dict.items():
serial, version = object_serial_dict[oid]
data = data_dict[oid]
tid = local_var.tid
@@ -608,8 +610,8 @@
data)
if new_data is not None:
# Mark this conflict as resolved
- local_var.resolved_conflict_serial_dict[oid] = \
- local_var.conflict_serial_dict.pop(oid)
+ resolved_conflict_serial_dict[oid] = \
+ conflict_serial_dict.pop(oid)
# Try to store again
self.store(oid, conflict_serial, new_data, version,
local_var.txn)
More information about the Neo-report
mailing list