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/caldav/caldav_node.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/caldav/caldav_node.py')
| -rw-r--r-- | addons/caldav/caldav_node.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py index e1181726bbf..d91db94fc90 100644 --- a/addons/caldav/caldav_node.py +++ b/addons/caldav/caldav_node.py @@ -26,7 +26,10 @@ import logging import StringIO from orm_utils import get_last_modified -from tools.dict_tools import dict_merge, dict_merge2 +try: + from tools.dict_tools import dict_merge, dict_merge2 +except ImportError: + from document.dict_tools import dict_merge, dict_merge2 # TODO: implement DAV-aware errors, inherit from IOError |