From de5c84c0e1a4d3a0ed2165e05b09c5354090ffdb Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Wed, 27 Mar 2013 16:47:14 +0100 Subject: [PATCH] [REF] removed nested import openerp. bzr revid: vmt@openerp.com-20130327154714-fa3k6gqtsmlt3vx6 --- openerp/addons/base/ir/ir_actions.py | 5 ++--- openerp/report/__init__.py | 4 ++-- openerp/report/interface.py | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py index 1d717048b3f..cbdddb4401c 100644 --- a/openerp/addons/base/ir/ir_actions.py +++ b/openerp/addons/base/ir/ir_actions.py @@ -20,11 +20,13 @@ ############################################################################## import logging +import operator import os import re from socket import gethostname import time +import openerp from openerp import SUPERUSER_ID from openerp import netsvc, tools from openerp.osv import fields, osv @@ -89,9 +91,6 @@ class report_xml(osv.osv): """ Look up a report definition. """ - import openerp - import operator - import os opj = os.path.join # First lookup in the deprecated place, because if the report definition diff --git a/openerp/report/__init__.py b/openerp/report/__init__.py index 647e6ba93a6..2cf01636806 100644 --- a/openerp/report/__init__.py +++ b/openerp/report/__init__.py @@ -19,6 +19,8 @@ # ############################################################################## +import openerp + import interface import print_xml import print_fnc @@ -30,12 +32,10 @@ import report_sxw import printscreen - def render_report(cr, uid, ids, name, data, context=None): """ Helper to call ``ir.actions.report.xml.render_report()``. """ - import openerp registry = openerp.modules.registry.RegistryManager.get(cr.dbname) return registry['ir.actions.report.xml'].render_report(cr, uid, ids, name, data, context) diff --git a/openerp/report/interface.py b/openerp/report/interface.py index 2f3a89a913b..39de2fc7a31 100644 --- a/openerp/report/interface.py +++ b/openerp/report/interface.py @@ -25,6 +25,7 @@ import re from lxml import etree import openerp.pooler as pooler +import openerp import openerp.tools as tools import openerp.modules import print_xml @@ -45,7 +46,6 @@ class report_int(object): def __init__(self, name, register=True): if register: - import openerp assert openerp.conf.deprecation.allow_report_int_registration assert name.startswith('report.'), 'Report names should start with "report.".' assert name not in self._reports, 'The report "%s" already exists.' % name