[FIX] document_webdav graceful import
bzr revid: al@openerp.com-20121210151725-t4bc08hyitf54y3u
This commit is contained in:
parent
7852c12d8a
commit
a03988e353
|
@ -18,11 +18,15 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
import logging
|
||||||
|
|
||||||
import webdav
|
_logger = logging.getLogger(__name__)
|
||||||
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=/')
|
||||||
|
|
||||||
#eof
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
|
|
@ -29,12 +29,10 @@ import urllib
|
||||||
from osv import osv
|
from osv import osv
|
||||||
from tools.translate import _
|
from tools.translate import _
|
||||||
|
|
||||||
try:
|
from DAV import utils
|
||||||
from DAV import utils
|
from DAV.propfind import PROPFIND
|
||||||
from DAV.propfind import PROPFIND
|
from DAV.report import REPORT
|
||||||
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=/'))
|
|
||||||
|
|
||||||
import tools
|
import tools
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue