odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] database restoration 

Leftover CherryPy code (cherrypy's file wrapper —
cherrypy._cpreqbody.Part — gives access to the underlying data stream
via the `file` attribute, Werkzeug uses the `stream` attributes and
proxies all file methods through the FileStorage, just remove the
indirection)

lp bug: https://launchpad.net/bugs/889122 fixed

bzr revid: xmo@openerp.com-20111114125106-zymon3zb4umlwhr2
This commit is contained in:
Xavier Morel 2011-11-14 13:51:06 +01:00
parent 6edf84e7bd
commit 266cbd3f88
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web/controllers/main.py
View File

@ -307,7 +307,7 @@ class Database(openerpweb.Controller):
@openerpweb.httprequest
def restore(self, req, db_file, restore_pwd, new_db):
try:
data = base64.b64encode(db_file.file.read())
data = base64.b64encode(db_file.read())
req.session.proxy("db").restore(restore_pwd, new_db, data)
return ''
except xmlrpclib.Fault, e: