[MERGE] Sync wirth trunk.

bzr revid: tde@openerp.com-20121218093241-y0id5g1r1k6yok42

1 files changed, 16 insertions, 9 deletions

diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index bf8b843a0a0..aedad059c16 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -20,21 +20,28 @@
 #
 ##############################################################################
 
+import logging
+
+_logger = logging.getLogger(__name__)
 import xml.dom.minidom
 domimpl = xml.dom.minidom.getDOMImplementation()
 from xml.dom.minicompat import StringTypes
 
 import urlparse
 import urllib
-from osv import osv
-from tools.translate import _
-
-from DAV import utils
-from DAV.propfind import PROPFIND
-from DAV.report import REPORT
-
-
-import tools
+from openerp.osv import osv
+from openerp.tools.translate import _
+
+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
+
+from openerp import tools
 
 class Text2(xml.dom.minidom.Text):
     def writexml(self, writer, indent="", addindent="", newl=""):