[MERGE]

bzr revid: pga@tinyerp.com-20130508124639-wfb2mpy15tnzs787

4 files changed, 7 insertions, 9 deletions

diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index a8ef9082b2c..fef7d7b5940 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -37,7 +37,7 @@ except ImportError:
     from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree
 
 import openerp
-from openerp import sql_db, netsvc
+from openerp import sql_db
 import openerp.service
 from openerp.tools import misc
 
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
index 5e819e01754..9a35f3cfe1b 100644
--- a/addons/document_webdav/nodes.py
+++ b/addons/document_webdav/nodes.py
@@ -67,7 +67,7 @@ class node_acl_mixin(object):
         """
         ret = par_class.get_dav_props(self, cr)
         if prop_model:
-            propobj = self.context._dirobj.pool.get(prop_model)
+            propobj = self.context._dirobj.pool[prop_model]
             uid = self.context.uid
             ctx = self.context.context.copy()
             ctx.update(self.dctx)
@@ -105,7 +105,7 @@ class node_acl_mixin(object):
         if ret is not None:
             return ret
         if prop_model:
-            propobj = self.context._dirobj.pool.get(prop_model)
+            propobj = self.context._dirobj.pool[prop_model]
             uid = self.context.uid
             ctx = self.context.context.copy()
             ctx.update(self.dctx)
@@ -151,7 +151,7 @@ class node_acl_mixin(object):
         assert prop_model
         assert res_id
         assert isinstance(lock_data, dict), '%r' % lock_data
-        propobj = self.context._dirobj.pool.get(prop_model)
+        propobj = self.context._dirobj.pool[prop_model]
         uid = self.context.uid
         ctx = self.context.context.copy()
         ctx.update(self.dctx)
diff --git a/addons/document_webdav/test/webdav_test1.yml b/addons/document_webdav/test/webdav_test1.yml
index 82236f63846..ae91d7cd4a8 100644
--- a/addons/document_webdav/test/webdav_test1.yml
+++ b/addons/document_webdav/test/webdav_test1.yml
@@ -47,10 +47,9 @@
 -
     !python {model: ir.attachment}: |
         from document_webdav import test_davclient as te
-        import addons
         dc = te.DAVClient()
         dc.get_creds(self, cr, uid)
-        tdp = addons.get_module_resource('document_webdav', 'test_davclient.py')
+        tdp = openerp.modules.module.get_module_resource('document_webdav', 'test_davclient.py')
         res = dc.gd_put(path=cr.dbname+'/Documents/test_davclient.py', srcpath=tdp)
 -
     I will try to get the file from the root
@@ -60,5 +59,5 @@
         import addons
         dc = te.DAVClient()
         dc.get_creds(self, cr, uid)
-        tdp = addons.get_module_resource('document_webdav', 'test_davclient.py')
+        tdp = openerp.modules.module.get_module_resource('document_webdav', 'test_davclient.py')
         res = dc.gd_get(path=cr.dbname+'/Documents/test_davclient.py', crange=(4,508), compare=tdp)
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 90b42fd8b5f..f67de272e29 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -36,7 +36,6 @@
 
 import logging
 import openerp
-from openerp import netsvc
 from dav_fs import openerp_dav_handler
 from openerp.tools.config import config
 try:
@@ -609,7 +608,7 @@ try:
             if base_path and base_path == '/':
                 dir_path = config.get_misc('static-http', 'dir_path', False)
             else:
-                dir_path = openerp.addons.get_module_resource('document_webdav','public_html')
+                dir_path = openerp.modules.module.get_module_resource('document_webdav','public_html')
                 # an _ugly_ hack: we put that dir back in tools.config.misc, so that
                 # the StaticHttpHandler can find its dir_path.
                 config.misc.setdefault('static-http',{})['dir_path'] = dir_path