diff options
Diffstat (limited to 'addons/document_webdav')
| -rw-r--r-- | addons/document_webdav/dav_fs.py | 5 | ||||
| -rw-r--r-- | addons/document_webdav/nodes.py | 6 |
2 files changed, 9 insertions, 2 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 diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py index 67dc9fd2a4f..8bea54ab7d3 100644 --- a/addons/document_webdav/nodes.py +++ b/addons/document_webdav/nodes.py @@ -22,7 +22,11 @@ from document import nodes from tools.safe_eval import safe_eval as eval -from tools.dict_tools import dict_filter +try: + from tools.dict_tools import dict_filter +except ImportError: + from document.dict_tools import dict_filter + import urllib |