From e7f4891d4634875e960939e7f5d36063ed4b62c1 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Thu, 6 Dec 2012 15:56:32 +0100
Subject: [IMP] use the openerp namespace.

bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
---
 addons/document_webdav/webdav.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/document_webdav/webdav.py')

diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index f714ff51518..e31787b73f6 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -26,8 +26,8 @@ from xml.dom.minicompat import StringTypes
 
 import urlparse
 import urllib
-from osv import osv
-from tools.translate import _
+from openerp.osv import osv
+from openerp.tools.translate import _
 
 try:
     from DAV import utils
@@ -36,7 +36,7 @@ try:
 except ImportError:
     raise osv.except_osv(_('PyWebDAV Import Error!'), _('Please install PyWebDAV from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.gz&can=2&q=/'))
 
-import tools
+from openerp import tools
 
 class Text2(xml.dom.minidom.Text):
     def writexml(self, writer, indent="", addindent="", newl=""):
-- 
cgit v1.2.3


From 0d168ae647fb2a1364af26ae468bf82e35dfa7de Mon Sep 17 00:00:00 2001
From: "dle@openerp.com" <>
Date: Wed, 12 Dec 2012 18:42:32 +0100
Subject: [FIX] Wrong pywebdav lib import

bzr revid: dle@openerp.com-20121212174232-5pnme7whe9yskrj7
---
 addons/document_webdav/webdav.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'addons/document_webdav/webdav.py')

diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index bf8b843a0a0..f7780883bda 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -20,6 +20,9 @@
 #
 ##############################################################################
 
+import logging
+
+_logger = logging.getLogger(__name__)
 import xml.dom.minidom
 domimpl = xml.dom.minidom.getDOMImplementation()
 from xml.dom.minicompat import StringTypes
@@ -29,10 +32,14 @@ import urllib
 from osv import osv
 from tools.translate import _
 
-from DAV import utils
-from DAV.propfind import PROPFIND
-from DAV.report import REPORT
-
+try:
+    from pywebdav.lib import utils
+    from pywebdav.lib.propfind import PROPFIND
+    from pywebdav.lib.report import REPORT
+except ImportError:
+    from DAV import utils
+    from DAV.propfind import PROPFIND
+    from DAV.report import REPORT
 
 import tools
 
-- 
cgit v1.2.3