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

bzr revid: dle@openerp.com-20121212174232-5pnme7whe9yskrj7
---
 addons/document_webdav/__init__.py      | 10 +++-------
 addons/document_webdav/dav_fs.py        | 14 ++++++++++----
 addons/document_webdav/webdav.py        | 15 +++++++++++----
 addons/document_webdav/webdav_server.py | 14 ++++++++++----
 4 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/addons/document_webdav/__init__.py b/addons/document_webdav/__init__.py
index 11bbd35f7c3..3dc4c104c80 100644
--- a/addons/document_webdav/__init__.py
+++ b/addons/document_webdav/__init__.py
@@ -20,13 +20,9 @@
 ##############################################################################
 import logging
 
-_logger = logging.getLogger(__name__)
+import webdav
+import webdav_server
+import document_webdav
 
-try:
-    import webdav
-    import webdav_server
-    import document_webdav
-except ImportError:
-    _logger.info('document_webdav disabled please install PyWebDAV from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.gz&can=2&q=/')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 1b826434f74..0a9df3d50d4 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -27,13 +27,19 @@ import errno
 
 import netsvc
 import urlparse
+try:
+    from pywebdav.lib.constants import COLLECTION  # , OBJECT
+    from pywebdav.lib.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
+    from pywebdav.lib.iface import dav_interface
+    from pywebdav.lib.davcmd import copyone, copytree, moveone, movetree, delone, deltree
+except ImportError:
+    from DAV.constants import COLLECTION  #, OBJECT
+    from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
+    from DAV.iface import dav_interface
+    from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree
 
-from DAV.constants import COLLECTION  #, OBJECT
-from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
-from DAV.iface import dav_interface
 import urllib
 
-from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree
 from cache import memoize
 from tools import misc
 
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
 
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 70ad4d2657f..1dbad3510ca 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -38,7 +38,16 @@ import logging
 import netsvc
 from dav_fs import openerp_dav_handler
 from tools.config import config
-from DAV.WebDAVServer import DAVRequestHandler
+try:
+    from pywebdav.lib.WebDAVServer import DAVRequestHandler
+    from pywebdav.lib.utils import IfParser, TagList
+    from pywebdav.lib.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
+    from pywebdav.lib.propfind import PROPFIND
+except ImportError:
+    from DAV.WebDAVServer import DAVRequestHandler
+    from DAV.utils import IfParser, TagList
+    from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
+    from DAV.propfind import PROPFIND
 from service import http_server
 from service.websrv_lib import FixSendError, HttpOptions
 from BaseHTTPServer import BaseHTTPRequestHandler
@@ -48,9 +57,6 @@ import re
 import time
 from string import atoi
 import addons
-from DAV.utils import IfParser, TagList
-from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
-from DAV.propfind import PROPFIND
 # from DAV.constants import DAV_VERSION_1, DAV_VERSION_2
 from xml.dom import minidom
 from redirect import RedirectHTTPHandler