From 69b23c9936c9ea987c8b3f1e4e8f688d81734303 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Fri, 1 Feb 2013 12:23:09 +0100
Subject: [PATCH] [REF] service: some code was touching the internal of
 netsvc.Service so it has to be updated.

bzr revid: vmt@openerp.com-20130201112309-bjhu7jems82uk6bg
---
 addons/document/document.py       |  4 ++--
 addons/edi/edi_service.py         |  2 +-
 addons/report_webkit/ir_report.py | 11 ++++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index 1671b6bc1ba..85468e00509 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -31,11 +31,11 @@ from StringIO import StringIO
 import psycopg2
 
 import openerp
-from openerp import netsvc
 from openerp import pooler
 from openerp import tools
 from openerp.osv import fields, osv
 from openerp.osv.orm import except_orm
+import openerp.report.interface
 from openerp.tools.misc import ustr
 from openerp.tools.translate import _
 from openerp.tools.safe_eval import safe_eval
@@ -456,7 +456,7 @@ class document_directory_content(osv.osv):
         if node.extension != '.pdf':
             raise Exception("Invalid content: %s" % node.extension)
         report = self.pool.get('ir.actions.report.xml').browse(cr, uid, node.report_id, context=context)
-        srv = netsvc.Service._services['report.'+report.report_name]
+        srv = openerp.report.interface.report_int._reports['report.'+report.report_name]
         ctx = node.context.context.copy()
         ctx.update(node.dctx)
         pdf,pdftype = srv.create(cr, uid, [node.act_id,], {}, context=ctx)
diff --git a/addons/edi/edi_service.py b/addons/edi/edi_service.py
index 3bd562ac0bb..d5dc5c09f74 100644
--- a/addons/edi/edi_service.py
+++ b/addons/edi/edi_service.py
@@ -53,7 +53,7 @@ def exp_import_edi_document(db_name, uid, passwd, edi_document, context=None):
 def exp_import_edi_url(db_name, uid, passwd, edi_url, context=None):
     return _edi_dispatch(db_name, 'import_edi', uid, None, edi_url)
 
-@openerp.service.rpc('edi')
+@openerp.http.rpc('edi')
 def dispatch(method, params):
     if method in ['import_edi_document',  'import_edi_url']:
         (db, uid, passwd) = params[0:3]
diff --git a/addons/report_webkit/ir_report.py b/addons/report_webkit/ir_report.py
index 1385f504928..01b65987a8e 100644
--- a/addons/report_webkit/ir_report.py
+++ b/addons/report_webkit/ir_report.py
@@ -30,21 +30,22 @@
 ##############################################################################
 
 from openerp.osv import fields, osv
-from openerp import netsvc
-from webkit_report import WebKitParser
+import openerp.report.interface
 from openerp.report.report_sxw import rml_parse
 
+from webkit_report import WebKitParser
+
 def register_report(name, model, tmpl_path, parser=rml_parse):
     """Register the report into the services"""
     name = 'report.%s' % name
-    if netsvc.Service._services.get(name, False):
-        service = netsvc.Service._services[name]
+    if name in openerp.report.interface.report_int._reports:
+        service = openerp.report.interface.report_int[name]
         if isinstance(service, WebKitParser):
             #already instantiated properly, skip it
             return
         if hasattr(service, 'parser'):
             parser = service.parser
-        del netsvc.Service._services[name]
+        del openerp.report.interface.report_int[name]
     WebKitParser(name, model, tmpl_path, parser=parser)