Merge lp:~openerp-dev/openerp-web/trunk-bug-941124-amp into lp:openerp-web

Proposed by Amit Parik
Status: Merged
Merged at revision: 2503
Proposed branch: lp:~openerp-dev/openerp-web/trunk-bug-941124-amp
Merge into: lp:openerp-web
Diff against target: 12 lines (+1/-1)
1 file modified
addons/web/common/http.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-bug-941124-amp
Reviewer Review Type Date Requested Status
Nicolas Vanhoren (OpenERP) (community) Approve
Review via email: mp+108120@code.launchpad.net

Description of the change

Hello,

When exception raised from the report service it will gives a error because value passed as a tuple instead of string.

This fix will solve the problem.

Thanks!

To post a comment you must log in.
Revision history for this message
Nicolas Vanhoren (OpenERP) (niv-openerp) wrote :

Well, it should not be bad

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/common/http.py'
2--- addons/web/common/http.py 2012-02-23 12:32:13 +0000
3+++ addons/web/common/http.py 2012-05-31 08:37:22 +0000
4@@ -593,7 +593,7 @@
5 except Exception,e:
6 # TODO change the except to raise LibException instead of their emulated xmlrpc fault
7 if isinstance(e, openerp.osv.osv.except_osv):
8- fault = xmlrpclib.Fault('warning -- ' + e.name + '\n\n' + e.value, '')
9+ fault = xmlrpclib.Fault('warning -- ' + e.name + '\n\n' + str(e.value), '')
10 elif isinstance(e, openerp.exceptions.Warning):
11 fault = xmlrpclib.Fault('warning -- Warning\n\n' + str(e), '')
12 elif isinstance(e, openerp.exceptions.AccessError):