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

[MERGE] [FIX] databases list: allow to have entries with unicode char in the database list (opw 589765) 

This does not allow to use a database with unicode to run openerp but does not fail (was getting an empty list of existing databases)

bzr revid: mat@openerp.com-20140214144444-0tjcz14rhlw94i50
This commit is contained in:
Martin Trigaux 2014-02-14 15:44:44 +01:00
parent 9cc13d4216 b8690e58e9
commit c0308d7522
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openerp/service/web_services.py
View File

@ -371,7 +371,7 @@ class db(netsvc.ExportService):
cr.execute("select datname from pg_database where datdba=(select usesysid from pg_user where usename=%s) and datname not in %s order by datname", (db_user, templates_list))
else:
cr.execute("select datname from pg_database where datname not in %s order by datname", (templates_list,))
res = [str(name) for (name,) in cr.fetchall()]
res = [tools.ustr(name) for (name,) in cr.fetchall()]
except Exception:
res = []
finally: