diff options
| author | dle@openerp.com <> | 2012-12-12 18:42:32 +0100 |
|---|---|---|
| committer | dle@openerp.com <> | 2012-12-12 18:42:32 +0100 |
| commit | 0d168ae647fb2a1364af26ae468bf82e35dfa7de (patch) | |
| tree | 46d1cbb3b6955d785954417373d93c8dae8928ad /addons/document_webdav/webdav.py | |
| parent | 9e9282a14126d0a3c2ab5a599f32a4695222aec3 (diff) | |
[FIX] Wrong pywebdav lib import
bzr revid: dle@openerp.com-20121212174232-5pnme7whe9yskrj7
Diffstat (limited to 'addons/document_webdav/webdav.py')
| -rw-r--r-- | addons/document_webdav/webdav.py | 15 |
1 files changed, 11 insertions, 4 deletions
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 |
