summaryrefslogtreecommitdiff
path: root/addons/document_webdav/dav_fs.py
diff options
context:
space:
mode:
authorP. Christeas <p_christ@hol.gr>2010-11-23 20:49:05 +0200
committerP. Christeas <p_christ@hol.gr>2010-11-23 20:49:05 +0200
commit91a0bbf1c53c7a3ae97ce6556029c2fbfcc168c0 (patch)
tree95a8ba28fe1a42ede3d67f3d3f4336c27af8ee96 /addons/document_webdav/dav_fs.py
parenta7cc6e51a439584931bc234557d528e9ac59ac4a (diff)
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
Diffstat (limited to 'addons/document_webdav/dav_fs.py')
-rw-r--r--addons/document_webdav/dav_fs.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index c34a323fadb..666ecb0133f 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)