Document, caldav: inhibit features not found on trunk server.

bzr revid: p_christ@hol.gr-20101012112733-sqcnvobi5q8ztj3l

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
 

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