[MERGE] trunk-import-openerp-thu (use strict naming convention when importing openerp stuff)

bzr revid: rco@openerp.com-20121218085914-qzr2upqfxmfbzfsx

7 files changed, 21 insertions, 28 deletions

diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 5b3e4272042..59e93fa3722 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -18,17 +18,13 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import pooler
-import sql_db
-
 import os
 import time
 import errno
 import re
-
-import openerp
-import netsvc
 import urlparse
+import urllib
+
 try:
     from pywebdav.lib.constants import COLLECTION  # , OBJECT
     from pywebdav.lib.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
@@ -40,18 +36,14 @@ except ImportError:
     from DAV.iface import dav_interface
     from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree
 
-import urllib
+import openerp
+from openerp import pooler, sql_db, netsvc
+from openerp.tools import misc
+from openerp.addons.document.dict_tools import dict_merge2
 
 from cache import memoize
-from tools import misc
-
 from webdav import mk_lock_response
 
-try:
-    from tools.dict_tools import dict_merge2
-except ImportError:
-    from document.dict_tools import dict_merge2
-
 CACHE_SIZE=20000
 
 #hack for urlparse: add webdav in the net protocols
diff --git a/addons/document_webdav/document_webdav.py b/addons/document_webdav/document_webdav.py
index cb1315140a3..90150bab620 100644
--- a/addons/document_webdav/document_webdav.py
+++ b/addons/document_webdav/document_webdav.py
@@ -19,9 +19,10 @@
 #
 ##############################################################################
 
-from osv import osv, fields
+from openerp.osv import fields, osv
+from openerp.tools import config
+
 import nodes
-from tools import config
 
 class document_davdir(osv.osv):
     _inherit = 'document.directory'
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
index a8fedee4fe3..d6bb5a6655f 100644
--- a/addons/document_webdav/nodes.py
+++ b/addons/document_webdav/nodes.py
@@ -21,7 +21,7 @@
 
 
 from document import nodes
-from tools.safe_eval import safe_eval as eval
+from openerp.tools.safe_eval import safe_eval as eval
 import time
 import urllib
 import uuid
diff --git a/addons/document_webdav/redirect.py b/addons/document_webdav/redirect.py
index c3dd9248f45..41cbe3b883b 100644
--- a/addons/document_webdav/redirect.py
+++ b/addons/document_webdav/redirect.py
@@ -22,8 +22,8 @@
 
 import logging
 import urlparse
-from service.websrv_lib import FixSendError, HTTPHandler, HttpOptions
-from service.http_server import HttpLogHandler
+from openerp.service.websrv_lib import FixSendError, HTTPHandler, HttpOptions
+from openerp.service.http_server import HttpLogHandler
 _logger = logging.getLogger(__name__)
 class RedirectHTTPHandler(HttpLogHandler, FixSendError, HttpOptions, HTTPHandler):
     
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
index 79ee471c69e..058dc1c748d 100644
--- a/addons/document_webdav/test_davclient.py
+++ b/addons/document_webdav/test_davclient.py
@@ -38,7 +38,7 @@ import xml.dom.minidom
 
 import httplib
 
-from tools import config
+from openerp.tools import config
 from xmlrpclib import Transport, ProtocolError
 import StringIO
 import base64
diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index f7780883bda..aedad059c16 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -29,8 +29,8 @@ from xml.dom.minicompat import StringTypes
 
 import urlparse
 import urllib
-from osv import osv
-from tools.translate import _
+from openerp.osv import osv
+from openerp.tools.translate import _
 
 try:
     from pywebdav.lib import utils
@@ -41,7 +41,7 @@ except ImportError:
     from DAV.propfind import PROPFIND
     from DAV.report import REPORT
 
-import tools
+from openerp import tools
 
 class Text2(xml.dom.minidom.Text):
     def writexml(self, writer, indent="", addindent="", newl=""):
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):