From 91a0bbf1c53c7a3ae97ce6556029c2fbfcc168c0 Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Tue, 23 Nov 2010 20:49:05 +0200 Subject: [PATCH] doc webdav: Fix putting of utf-8 names We had a mix of unicode and utf-8 encoded strings, which broke the join at line 700. bzr revid: p_christ@hol.gr-20101123184905-9t7v1jrx257oog27 --- addons/document_webdav/dav_fs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py index c34a323..666ecb0 100644 --- a/addons/document_webdav/dav_fs.py +++ b/addons/document_webdav/dav_fs.py @@ -681,7 +681,7 @@ class openerp_dav_handler(dav_interface): except Exception: node = False - objname = uri2[-1] + objname = misc.ustr(uri2[-1]) ret = None if not node: @@ -714,7 +714,7 @@ class openerp_dav_handler(dav_interface): etag = str(newchild.get_etag(cr)) except Exception, e: self.parent.log_error("Cannot get etag for node: %s" % e) - ret = (hurl, etag) + ret = (str(hurl), etag) else: self._try_function(node.set_data, (cr, data), "save %s" % objname, cr=cr) -- 1.7.10.4