diff options
| author | P. Christeas <p_christ@hol.gr> | 2010-10-12 14:27:33 +0300 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2010-10-12 14:27:33 +0300 |
| commit | 60f2488febb54174ff0b8e2dfd51b5c1963efb41 (patch) | |
| tree | bdb68bf2aa68972b72a812f69edee4e8459f02de /addons/document_webdav/dav_fs.py | |
| parent | 305b48abe3195f3a7d93852637c79228885d01a2 (diff) | |
Document, caldav: inhibit features not found on trunk server.
bzr revid: p_christ@hol.gr-20101012112733-sqcnvobi5q8ztj3l
Diffstat (limited to 'addons/document_webdav/dav_fs.py')
| -rw-r--r-- | addons/document_webdav/dav_fs.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py index 7deb18f714c..5b5b1341679 100644 --- a/addons/document_webdav/dav_fs.py +++ b/addons/document_webdav/dav_fs.py @@ -37,7 +37,10 @@ import urllib from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree from cache import memoize from tools import misc -from tools.dict_tools import dict_merge2 +try: + from tools.dict_tools import dict_merge2 +except ImportError: + from document.dict_tools import dict_merge2 CACHE_SIZE=20000 |