diff options
| author | Cecile Tonglet <cto@openerp.com> | 2012-12-17 15:59:21 +0100 |
|---|---|---|
| committer | Cecile Tonglet <cto@openerp.com> | 2012-12-17 15:59:21 +0100 |
| commit | 331fdf86755e37dcf5f33679f8f2c35f2601c4cc (patch) | |
| tree | 5c4fbb423de597c0325c91109fd1ec6aceb78240 /addons/document_webdav/webdav.py | |
| parent | 15fe5156011f67b575aa5f819d52735cb999b3c8 (diff) | |
| parent | 5ab570b5ea994e120a1611c4e5250af37977e8c1 (diff) | |
[MERGE] From trunk (second time)
bzr revid: cto@openerp.com-20121217145921-6pk1jrktppezuq13
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 0f5f34d1c9d..aedad059c16 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 openerp.osv import osv from openerp.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 from openerp import tools |