Merge lp:~therp-nl/openerp-web/web-7.0_lp1193563_typeerror-expected_bytes into lp:openerp-web/7.0
Proposed by
Ronald Portier (Therp)
Status: | Merged |
---|---|
Merge reported by: | Nicolas Vanhoren (OpenERP) |
Merged at revision: | not available |
Proposed branch: | lp:~therp-nl/openerp-web/web-7.0_lp1193563_typeerror-expected_bytes |
Merge into: | lp:openerp-web/7.0 |
Diff against target: |
38 lines (+4/-4) 1 file modified
addons/web/controllers/main.py (+4/-4) |
To merge this branch: | bzr merge lp:~therp-nl/openerp-web/web-7.0_lp1193563_typeerror-expected_bytes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Core Team | Pending | ||
Review via email:
|
Description of the change
Replace int(token) by simply token on strings used to create a fileToken cookie.
Prevents crash with newer versions of Werkzeug.
To post a comment you must log in.