Merge lp:~therp-nl/openerp-web/web-7.0_lp1193563_typeerror-expected_bytes into lp:openerp-web/7.0

[Ronald Portier (Therp)]

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

Prevents crash with newer versions of Werkzeug.

=== 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:21:27 +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: