diff options
| author | Cecile Tonglet <cto@openerp.com> | 2012-12-17 15:59:21 +0100 |
|---|---|---|
| committer | Cecile Tonglet <cto@openerp.com> | 2012-12-17 15:59:21 +0100 |
| commit | 331fdf86755e37dcf5f33679f8f2c35f2601c4cc (patch) | |
| tree | 5c4fbb423de597c0325c91109fd1ec6aceb78240 /addons/document_webdav/__init__.py | |
| parent | 15fe5156011f67b575aa5f819d52735cb999b3c8 (diff) | |
| parent | 5ab570b5ea994e120a1611c4e5250af37977e8c1 (diff) | |
[MERGE] From trunk (second time)
bzr revid: cto@openerp.com-20121217145921-6pk1jrktppezuq13
Diffstat (limited to 'addons/document_webdav/__init__.py')
| -rw-r--r-- | addons/document_webdav/__init__.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/addons/document_webdav/__init__.py b/addons/document_webdav/__init__.py index 11bbd35f7c3..3dc4c104c80 100644 --- a/addons/document_webdav/__init__.py +++ b/addons/document_webdav/__init__.py @@ -20,13 +20,9 @@ ############################################################################## import logging -_logger = logging.getLogger(__name__) +import webdav +import webdav_server +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=/') # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |