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

Proposed by Jiten (OpenERP)
Status: Rejected
Rejected by: Xavier (Open ERP)
Proposed branch: lp:~openerp-dev/openobject-client-web/6.0-bug-753657-jra
Merge into: lp:openobject-client-web
Diff against target: 12 lines (+1/-1)
1 file modified
addons/openerp/utils/utils.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-client-web/6.0-bug-753657-jra
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+56897@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Xavier (Open ERP) (xmo-deactivatedaccount) wrote :

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)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
110 if crummy_pseudoliteral_matcher.match(value):110 if crummy_pseudoliteral_matcher.match(value):
111 try:111 try:
112 return openobject.tools.ast.literal_eval(value)112 return openobject.tools.ast.literal_eval(value)
113 except ValueError:113 except:
114 pass114 pass
115115
116 return value116 return value