openerp-dev-web team mailing list archive

[xrg <xrg@xxxxxxxxx>]

xrg has proposed merging lp:~openerp-dev/openobject-addons/6.0-bug-730172-xrg into lp:openobject-addons/6.0.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  #730172 anonymization: try to fix the deprecation warnings
  https://bugs.launchpad.net/bugs/730172

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-bug-730172-xrg/+merge/52328
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-bug-730172-xrg/+merge/52328
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-bug-730172-xrg.

=== modified file 'anonymization/anonymization.py'
--- anonymization/anonymization.py	2011-02-18 13:11:50 +0000
+++ anonymization/anonymization.py	2011-03-06 15:56:17 +0000
@@ -295,9 +295,8 @@
 
         eview = etree.fromstring(res['arch'])
         placeholder = eview.xpath("group[@name='placeholder1']")
-        placeholder = len(placeholder) and placeholder[0] or None
-
-        if placeholder:
+        if len(placeholder):
+            placeholder = placeholder[0]
             if step == 'new_window' and state == 'clear':
                 # clicked in the menu and the fields are not anonymized: warn the admin that backuping the db is very important
                 placeholder.addnext(etree.Element('field', {'name': 'msg', 'colspan': '4', 'nolabel': '1'}))