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_server.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

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

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
-- 
cgit v1.2.3