[Neo-report] r2541 gregory - in /trunk/neo/client: app.py iterator.py

[nobody at svn.erp5.org]

Author: gregory
Date: Wed Dec 15 10:08:27 2010
New Revision: 2541

Log:
Iterator handles extension informations.

Modified:
    trunk/neo/client/app.py
    trunk/neo/client/iterator.py

Modified: trunk/neo/client/app.py
==============================================================================
--- trunk/neo/client/app.py [iso-8859-1] (original)
+++ trunk/neo/client/app.py [iso-8859-1] Wed Dec 15 10:08:27 2010
@@ -1184,12 +1184,14 @@ class Application(object):
                                     'be found' % (tid, )
 
             if filter is None or filter(self.local_var.txn_info):
-                self.local_var.txn_info.pop('packed')
+                txn_info = self.local_var.txn_info
+                txn_info.pop('packed')
                 if not with_oids:
-                    self.local_var.txn_info.pop("oids")
-                append(self.local_var.txn_info)
-                self._insertMetadata(self.local_var.txn_info,
-                        self.local_var.txn_ext)
+                    txn_info.pop("oids")
+                    self._insertMetadata(txn_info, self.local_var.txn_ext)
+                else:
+                    txn_info['ext'] = loads(self.local_var.txn_ext)
+                append(txn_info)
                 if len(undo_info) >= last - first:
                     break
         # Check we return at least one element, otherwise call

Modified: trunk/neo/client/iterator.py
==============================================================================
--- trunk/neo/client/iterator.py [iso-8859-1] (original)
+++ trunk/neo/client/iterator.py [iso-8859-1] Wed Dec 15 10:08:27 2010
@@ -156,7 +156,7 @@ class Iterator(object):
         user = txn['user_name']
         desc = txn['description']
         oid_list = txn['oids']
-        extension = {} # as expected by the ZODB
+        extension = txn['ext']
         txn = Transaction(self.app, tid, ' ', user, desc, extension, oid_list,
             self._prev_serial_dict)
         return txn