diff options
| author | Raphael Collet <rco@openerp.com> | 2012-12-18 09:59:14 +0100 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2012-12-18 09:59:14 +0100 |
| commit | 73980eba5f64c674b0bc366c714a9a38d3bb915a (patch) | |
| tree | fce41f64e3309f05aa0a33eae1395b445c389a41 /addons/document_webdav/webdav_server.py | |
| parent | 57acd22a0077feeae6261aae617ad9ad0a3be36d (diff) | |
| parent | 0cc0dfb8cf8d26c1029d02b7377226809821dc9b (diff) | |
[MERGE] trunk-import-openerp-thu (use strict naming convention when importing openerp stuff)
bzr revid: rco@openerp.com-20121218085914-qzr2upqfxmfbzfsx
Diffstat (limited to 'addons/document_webdav/webdav_server.py')
| -rw-r--r-- | addons/document_webdav/webdav_server.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py index a23f1a0806b..f801a56ee97 100644 --- a/addons/document_webdav/webdav_server.py +++ b/addons/document_webdav/webdav_server.py @@ -35,9 +35,9 @@ import logging -import netsvc +from openerp import netsvc from dav_fs import openerp_dav_handler -from tools.config import config +from openerp.tools.config import config try: from pywebdav.lib.WebDAVServer import DAVRequestHandler from pywebdav.lib.utils import IfParser, TagList @@ -48,8 +48,8 @@ except ImportError: from DAV.utils import IfParser, TagList from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound from DAV.propfind import PROPFIND -from service import http_server -from service.websrv_lib import FixSendError, HttpOptions +from openerp.service import http_server +from openerp.service.websrv_lib import FixSendError, HttpOptions from BaseHTTPServer import BaseHTTPRequestHandler import urlparse import urllib @@ -433,7 +433,7 @@ class DAVHandler(DAVRequestHandler, HttpOptions, FixSendError): data['lockowner'] = owners return data -from service.http_server import reg_http_service,OpenERPAuthProvider +from openerp.service.http_server import reg_http_service,OpenERPAuthProvider class DAVAuthProvider(OpenERPAuthProvider): def authenticate(self, db, user, passwd, client_address): |