summaryrefslogtreecommitdiff
path: root/addons/document_webdav/__init__.py
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2012-12-11 18:01:19 +0100
committerOlivier Dony <odo@openerp.com>2012-12-11 18:01:19 +0100
commit5b56a77add9a4f92b5cf2f84d419caff9b0dc4e6 (patch)
treee1f7f576fa8944d2d72e64876e7c42327e5d8879 /addons/document_webdav/__init__.py
parentf5fd0fc0815190b3e80854a8ad0afa7a5d1271c4 (diff)
parent33ae7185620cec8e621f7cec592db82c6b9e12fe (diff)
[MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121211170119-5spf2iqzl89kphnk
Diffstat (limited to 'addons/document_webdav/__init__.py')
-rw-r--r--addons/document_webdav/__init__.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/addons/document_webdav/__init__.py b/addons/document_webdav/__init__.py
index 7cd1a38fc80..11bbd35f7c3 100644
--- a/addons/document_webdav/__init__.py
+++ b/addons/document_webdav/__init__.py
@@ -18,11 +18,15 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
+import logging
-import webdav
-import webdav_server
+_logger = logging.getLogger(__name__)
-import document_webdav
+try:
+ import webdav
+ import webdav_server
+ import document_webdav
+except ImportError:
+ _logger.info('document_webdav disabled please install PyWebDAV from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.gz&can=2&q=/')
-#eof
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: