Merge lp:~ocb/ocb-web/ocb-web-7.0_lp1193563_typeerror-expected_bytes into lp:ocb-web

[Ronald Portier (Therp)]

Replace int(token) by simply token on strings used to create a fileToken cookie.

Prevents crash with newer versions of Werkzeug.

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

[Stefan Rijnhart (Opener) (stefan-opener)]

Rejecting this proposal on OCB, as the upstream branch was implemented

http://bazaar.launchpad.net/~openerp/openerp-web/7.0/revision/3999
http://bazaar.launchpad.net/~openerp/openerp-web/7.0/revision/4000

[Ronald Portier (Therp) (rportier1962)]

But problem still exists on upstream branch (revno 4033):

2013-12-14 09:22:18,791 27713 ERROR oe_openerp_standard70 openerp.addons.web.http.HttpRequest.dispatch: An error occurred while handling a json request
Traceback (most recent call last):
  File "/home/openeyedev/var/projects/oe_openerp_standard70/web/addons/web/http.py", line 285, in dispatch
    r = method(self, **self.params)
  File "/home/openeyedev/var/projects/oe_openerp_standard70/web/addons/web/controllers/main.py", line 1770, in index
    cookies={'fileToken': int(token)})
  File "/home/openeyedev/var/projects/oe_openerp_standard70/web/addons/web/http.py", line 332, in make_response
    response.set_cookie(k, v)
  File "/usr/lib/python2.7/dist-packages/werkzeug/wrappers.py", line 992, in set_cookie
    self.charset))
  File "/usr/lib/python2.7/dist-packages/werkzeug/http.py", line 905, in dump_cookie
    value = to_bytes(value, charset)
  File "/usr/lib/python2.7/dist-packages/werkzeug/_compat.py", line 106, in to_bytes
    raise TypeError('Expected bytes')
TypeError: Expected bytes

And that is because file web/addons/web/controllers/main.py still contains the fatal int() call:

1765 return req.make_response(report,
1766 headers=[
1767 ('Content-Disposition', content_disposition(file_name, req)),
1768 ('Content-Type', report_mimetype),
1769 ('Content-Length', len(report))],
1770 cookies={'fileToken': int(token)})

Had OpenERP just accepted my merge proposal, the problem would have been solved log ago. Likt is has been solved long ago on the community branch.

Unmerged revisions

3992. By Ronald Portier (Therp) on 2013-07-09

[FIX] Prevent crash on creating report or doing export when newer version of
    werkzeug installed.
    Fixes lp1193563.

=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py	2013-07-02 12:20:14 +0000
+++ addons/web/controllers/main.py	2013-07-09 19:32:33 +0000
@@ -812,7 +812,7 @@
             return req.make_response(db_dump,
                [('Content-Type', 'application/octet-stream; charset=binary'),
                ('Content-Disposition', content_disposition(filename, req))],
-               {'fileToken': int(token)}
+               {'fileToken': token}
             )
         except xmlrpclib.Fault, e:
             return simplejson.dumps([[],[{'error': e.faultCode, 'title': _('Backup Database')}]])
@@ -1320,7 +1320,7 @@
             return req.make_response(filecontent,
                 headers=[('Content-Type', 'application/octet-stream'),
                         ('Content-Disposition', content_disposition(filename, req))],
-                cookies={'fileToken': int(token)})
+                cookies={'fileToken': token})
 
     @openerpweb.httprequest
     def upload(self, req, callback, ufile):
@@ -1627,7 +1627,7 @@
             headers=[('Content-Disposition',
                             content_disposition(self.filename(model), req)),
                      ('Content-Type', self.content_type)],
-            cookies={'fileToken': int(token)})
+            cookies={'fileToken': token})
 
 class CSVExport(ExportFormat, http.Controller):
     _cp_path = '/web/export/csv'
@@ -1767,6 +1767,6 @@
                  ('Content-Disposition', content_disposition(file_name, req)),
                  ('Content-Type', report_mimetype),
                  ('Content-Length', len(report))],
-             cookies={'fileToken': int(token)})
+             cookies={'fileToken': token})
 
 # vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4: