diff options
| author | Antony Lesuisse <al@openerp.com> | 2012-12-10 16:17:25 +0100 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2012-12-10 16:17:25 +0100 |
| commit | a03988e353bb96a703b68fe0a8f8068be7eb8ba3 (patch) | |
| tree | 5ee361afeadec56d12b1aee284e976aed511d3fe /addons/document_webdav | |
| parent | 7852c12d8a212fc85889a0a63300b3f6b207c0ea (diff) | |
[FIX] document_webdav graceful import
bzr revid: al@openerp.com-20121210151725-t4bc08hyitf54y3u
Diffstat (limited to 'addons/document_webdav')
| -rw-r--r-- | addons/document_webdav/__init__.py | 12 | ||||
| -rw-r--r-- | addons/document_webdav/webdav.py | 10 |
2 files changed, 12 insertions, 10 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: diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py index f714ff51518..bf8b843a0a0 100644 --- a/addons/document_webdav/webdav.py +++ b/addons/document_webdav/webdav.py @@ -29,12 +29,10 @@ import urllib from osv import osv from tools.translate import _ -try: - from DAV import utils - from DAV.propfind import PROPFIND - from DAV.report import REPORT -except ImportError: - raise osv.except_osv(_('PyWebDAV Import Error!'), _('Please install PyWebDAV from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.gz&can=2&q=/')) +from DAV import utils +from DAV.propfind import PROPFIND +from DAV.report import REPORT + import tools |