Merge lp:~openerp-dev/openobject-client-web/6.0-bug-753657-jra into lp:openobject-client-web

[Jiten (OpenERP)]

Revert Minor changes from rev 4564 Due to regression generate Value Error "Invalid Token".

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Told you I was going to look into it. Fixed it this morning before checking the merge reviews for 6.0 branch...

Unmerged revisions

4569. By Jiten (OpenERP) on 2011-04-08

[FIX] Regression with rev 4564 to generate error 'invalid token'.

=== modified file 'addons/openerp/utils/utils.py'
--- addons/openerp/utils/utils.py	2011-04-04 13:06:39 +0000
+++ addons/openerp/utils/utils.py	2011-04-08 08:39:45 +0000
@@ -110,7 +110,7 @@
         if crummy_pseudoliteral_matcher.match(value):
             try:
                 return openobject.tools.ast.literal_eval(value)
-            except ValueError:
+            except:
                 pass
 
         return value