[IMP] use the openerp namespace.

bzr revid: vmt@openerp.com-20121210152723-mv4dykfu6ip1991h

openerp/addons/base/ir/ir_actions.py

@@ -22,17 +22,16 @@
 import logging
 import os
 import re
-import time
-import tools
-
-import netsvc
-from osv import fields,osv
-from report.report_sxw import report_sxw, report_rml
-from tools.config import config
-from tools.safe_eval import safe_eval as eval
-from tools.translate import _
 from socket import gethostname
+import time
+
 from openerp import SUPERUSER_ID
+from openerp import netsvc, tools
+from openerp.osv import fields, osv
+from openerp.report.report_sxw import report_sxw, report_rml
+from openerp.tools.config import config
+from openerp.tools.safe_eval import safe_eval as eval
+from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
 

openerp/addons/base/ir/ir_attachment.py

@@ -21,9 +21,9 @@
 
 import itertools
 
-from osv import fields,osv
+from openerp import tools
-from osv.orm import except_orm
+from openerp.osv import fields,osv
-import tools
+from openerp.osv.orm import except_orm
 
 class ir_attachment(osv.osv):
     def check(self, cr, uid, ids, mode, context=None, values=None):

openerp/addons/base/ir/ir_config_parameter.py

@@ -22,11 +22,12 @@
 Store database-specific configuration parameters
 """
 
-from osv import osv,fields
 import uuid
 import datetime
-from tools import misc, config
+
 from openerp import SUPERUSER_ID
+from openerp.osv import osv, fields
+from openerp.tools import misc, config
 
 """
 A dictionary holding some configuration parameters to be initialized when the database is created.

openerp/addons/base/ir/ir_cron.py

@@ -27,15 +27,13 @@ import psycopg2
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 
-import netsvc
 import openerp
-import pooler
+from openerp import netsvc, pooler, tools
-import tools
 from openerp.cron import WAKE_UP_NOW
-from osv import fields, osv
+from openerp.osv import fields, osv
-from tools import DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
-from tools.safe_eval import safe_eval as eval
+from openerp.tools.safe_eval import safe_eval as eval
-from tools.translate import _
+from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
 

openerp/addons/base/ir/ir_default.py

@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from openerp.osv import fields, osv
 
 class ir_default(osv.osv):
     _name = 'ir.default'

openerp/addons/base/ir/ir_exports.py

@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from openerp.osv import fields,osv
 
 
 class ir_exports(osv.osv):

openerp/addons/base/ir/ir_filters.py

@@ -20,8 +20,8 @@
 ##############################################################################
 
 from openerp import exceptions
-from osv import osv, fields
+from openerp.osv import osv, fields
-from tools.translate import _
+from openerp.tools.translate import _
 
 class ir_filters(osv.osv):
     '''

openerp/addons/base/ir/ir_mail_server.py

@@ -31,8 +31,7 @@ import re
 import smtplib
 import threading
 
-from osv import osv
+from openerp.osv import osv, fields
-from osv import fields
 from openerp.tools.translate import _
 from openerp.tools import html2text
 import openerp.tools as tools

openerp/addons/base/ir/ir_needaction.py

@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import osv
+from openerp.osv import osv
 
 class ir_needaction_mixin(osv.AbstractModel):
     '''Mixin class for objects using the need action feature.

openerp/addons/base/ir/ir_rule.py

@@ -19,14 +19,15 @@
 #
 ##############################################################################
 
-from osv import fields, osv, expression
 import time
 from operator import itemgetter
 from functools import partial
-import tools
+
-from tools.safe_eval import safe_eval as eval
-from tools.misc import unquote as unquote
 from openerp import SUPERUSER_ID
+from openerp import tools
+from openerp.osv import fields, osv, expression
+from openerp.tools.safe_eval import safe_eval as eval
+from openerp.tools.misc import unquote as unquote
 
 class ir_rule(osv.osv):
     _name = 'ir.rule'

openerp/addons/base/ir/ir_sequence.py

@@ -22,10 +22,9 @@
 import logging
 import time
 
-from osv import osv, fields
-from tools.translate import _
-
 import openerp
+from openerp.osv import osv
+from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
 

openerp/addons/base/ir/ir_translation.py

@@ -19,12 +19,12 @@
 #
 ##############################################################################
 
-import tools
 import logging
 
+from openerp import tools
 import openerp.modules
 from openerp.osv import fields, osv
-from tools.translate import _
+from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
 

openerp/addons/base/ir/ir_ui_menu.py

@@ -23,11 +23,11 @@
 import base64
 import re
 import threading
-from tools.safe_eval import safe_eval as eval
+from openerp.tools.safe_eval import safe_eval as eval
-import tools
+from openerp import tools
 import openerp.modules
-from osv import fields, osv
+from openerp.osv import fields, osv
-from tools.translate import _
+from openerp.tools.translate import _
 from openerp import SUPERUSER_ID
 
 def one_in(setA, setB):

openerp/addons/base/ir/ir_ui_view.py

@@ -19,14 +19,15 @@
 #
 ##############################################################################
 
-from osv import fields,osv
-from lxml import etree
-from tools import graph
-from tools.safe_eval import safe_eval as eval
-import tools
-from tools.view_validation import valid_view
-import os
 import logging
+from lxml import etree
+import os
+
+from openerp import tools
+from openerp.osv import fields,osv
+from openerp.tools import graph
+from openerp.tools.safe_eval import safe_eval as eval
+from openerp.tools.view_validation import valid_view
 
 _logger = logging.getLogger(__name__)
 

openerp/addons/base/ir/ir_values.py

@@ -19,10 +19,11 @@
 #
 ##############################################################################
 
-from osv import osv,fields
-from osv.orm import except_orm
 import pickle
-from tools.translate import _
+
+from openerp.osv import osv, fields
+from openerp.osv.orm import except_orm
+from openerp.tools.translate import _
 
 EXCLUDED_FIELDS = set((
     'report_sxw_content', 'report_rml_content', 'report_sxw', 'report_rml',

openerp/addons/base/ir/wizard/wizard_menu.py

@@ -18,7 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-from osv import fields,osv
+
+from openerp.osv import fields, osv
 
 class wizard_model_menu(osv.osv_memory):
     _name = 'wizard.ir.model.menu.create'

openerp/addons/base/ir/workflow/print_instance.py

@@ -20,11 +20,11 @@
 ##############################################################################
 
 import logging
-import time, os
+import time
-
-import netsvc
-import report,pooler,tools
 from operator import itemgetter
+import os
+
+from openerp import netsvc, pooler, report, tools
 
 _logger = logging.getLogger(__name__)
 

openerp/addons/base/module/report/ir_module_reference_print.py

@@ -20,7 +20,8 @@
 ##############################################################################
 
 import time
-from report import report_sxw
+
+from openerp.report import report_sxw
 
 class ir_module_reference_print(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):

openerp/addons/base/module/wizard/base_export_language.py

@@ -19,12 +19,13 @@
 #
 ##############################################################################
 
-import tools
 import base64
 import cStringIO
-from osv import fields,osv
+
-from tools.translate import _
+from openerp import tools
-from tools.misc import get_iso_codes
+from openerp.osv import fields,osv
+from openerp.tools.translate import _
+from openerp.tools.misc import get_iso_codes
 
 NEW_LANG_KEY = '__new__'
 

openerp/addons/base/module/wizard/base_import_language.py

@@ -19,10 +19,11 @@
 #
 ##############################################################################
 
-import tools
 import base64
 from tempfile import TemporaryFile
-from osv import osv, fields
+
+from openerp import tools
+from openerp.osv import osv, fields
 
 class base_language_import(osv.osv_memory):
     """ Language Import """

openerp/addons/base/module/wizard/base_language_install.py

@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-import tools
+from openerp import tools
-from osv import osv, fields
+from openerp.osv import osv, fields
-from tools.translate import _
+from openerp.tools.translate import _
 
 class base_language_install(osv.osv_memory):
     """ Install Language"""

openerp/addons/base/module/wizard/base_module_configuration.py

@@ -19,8 +19,8 @@
 #
 ##############################################################################
 
-from osv import osv
+from openerp.osv import osv
-from tools.translate import _
+from openerp.tools.translate import _
 
 class base_module_configuration(osv.osv_memory):
 

openerp/addons/base/module/wizard/base_module_import.py

@@ -19,14 +19,14 @@
 #
 ##############################################################################
 
-import os
-import tools
-
-import zipfile
-from StringIO import StringIO
 import base64
-from tools.translate import _
+import os
-from osv import osv, fields
+from StringIO import StringIO
+import zipfile
+
+from openerp import tools
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
 
 ADDONS_PATH = tools.config['addons_path'].split(",")[-1]
 

openerp/addons/base/module/wizard/base_module_update.py

@@ -18,7 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from osv import osv, fields
+
+from openerp.osv import osv, fields
 
 class base_module_update(osv.osv_memory):
     """ Update Module """
@@ -54,4 +55,4 @@ class base_module_update(osv.osv_memory):
         }
         return res
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

openerp/addons/base/module/wizard/base_update_translations.py

@@ -19,10 +19,11 @@
 #
 ##############################################################################
 
-from osv import osv, fields
-import tools
 import cStringIO
-from tools.translate import _
+
+from openerp import tools
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
 
 class base_update_translations(osv.osv_memory):
     def _get_languages(self, cr, uid, context):

openerp/addons/base/report/preview_report.py

@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from report import report_sxw
+from openerp.report import report_sxw
 
 class rmlparser(report_sxw.rml_parse):
     def set_context(self, objects, data, ids, report_type = None):

openerp/addons/base/res/__init__.py

@@ -19,8 +19,6 @@
 #
 ##############################################################################
 
-import tools
-
 import res_country
 import res_lang
 import res_partner

openerp/addons/base/res/ir_property.py

@@ -19,10 +19,11 @@
 #
 ##############################################################################
 
-from osv import osv,fields
-from tools.misc import attrgetter
 import time
 
+from openerp.osv import osv,fields
+from openerp.tools.misc import attrgetter
+
 # -------------------------------------------------------------------------
 # Properties
 # -------------------------------------------------------------------------

openerp/addons/base/res/res_bank.py

@@ -19,8 +19,8 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from openerp.osv import fields, osv
-from tools.translate import _
+from openerp.tools.translate import _
 
 class Bank(osv.osv):
     _description='Bank'

openerp/addons/base/res/res_company.py

@@ -19,14 +19,14 @@
 #
 ##############################################################################
 
-from osv import osv
-from osv import fields
 import os
-import tools
+
 import openerp
 from openerp import SUPERUSER_ID
-from tools.translate import _
+from openerp import tools
-from tools.safe_eval import safe_eval as eval
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp.tools.safe_eval import safe_eval as eval
 
 class multi_company_default(osv.osv):
     """

openerp/addons/base/res/res_config.py

@@ -18,14 +18,14 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import logging
 from operator import attrgetter, itemgetter
 
-from osv import osv, fields
+from openerp import netsvc, pooler
-from tools.translate import _
+from openerp.osv import osv, fields
-import netsvc
+from openerp.tools import ustr
-from tools import ustr
+from openerp.tools.translate import _
-import pooler
 
 _logger = logging.getLogger(__name__)
 

openerp/addons/base/res/res_country.py

@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from openerp.osv import fields, osv
 
 def location_name_search(self, cr, user, name='', args=None, operator='ilike',
                          context=None, limit=100):

openerp/addons/base/res/res_currency.py

@@ -18,14 +18,14 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import re
 import time
-import netsvc
-from osv import fields, osv
-import tools
 
-from tools import float_round, float_is_zero, float_compare
+from openerp import netsvc, tools
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools import float_round, float_is_zero, float_compare
+from openerp.tools.translate import _
 
 CURRENCY_DISPLAY_PATTERN = re.compile(r'(\w+)\s*(?:\((.*)\))?')
 

openerp/addons/base/res/res_lang.py

@@ -20,14 +20,14 @@
 ##############################################################################
 
 import locale
+from locale import localeconv
 import logging
 import re
 
-from osv import fields, osv
+from openerp import tools
-from locale import localeconv
+from openerp.osv import fields, osv
-import tools
+from openerp.tools.safe_eval import safe_eval as eval
-from tools.safe_eval import safe_eval as eval
+from openerp.tools.translate import _
-from tools.translate import _
 
 _logger = logging.getLogger(__name__)
 

openerp/addons/base/res/res_partner.py

@@ -20,17 +20,17 @@
 ##############################################################################
 
 import datetime
-import math
-import openerp
-from osv import osv, fields
-from openerp import SUPERUSER_ID
-import re
-import tools
-from tools.translate import _
 import logging
-import pooler
-import pytz
 from lxml import etree
+import math
+import pytz
+import re
+
+import openerp
+from openerp import SUPERUSER_ID
+from openerp import pooler, tools
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
 
 class format_address(object):
     def fields_view_get_address(self, cr, uid, arch, context={}):

openerp/addons/base/res/res_request.py

@@ -19,9 +19,10 @@
 #
 ##############################################################################
 
-from osv import osv, fields
 import time
 
+from openerp.osv import osv, fields
+
 def _links_get(self, cr, uid, context=None):
     obj = self.pool.get('res.request.link')
     ids = obj.search(cr, uid, [], context=context)

openerp/addons/base/res/res_users.py

@@ -25,17 +25,16 @@ from functools import partial
 import logging
 from lxml import etree
 from lxml.builder import E
-import netsvc
-from openerp import SUPERUSER_ID
-import openerp
-import openerp.exceptions
-from osv import fields,osv
-from osv.orm import browse_record
-import pooler
 import random
-from service import security
+
-import tools
+import openerp
-from tools.translate import _
+from openerp import SUPERUSER_ID
+from openerp import netsvc, pooler, tools
+import openerp.exceptions
+from openerp.osv import fields,osv
+from openerp.osv.orm import browse_record
+from openerp.service import security
+from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)