Antony Lesuisse (OpenERP) has proposed merging lp:~openerp-dev/openobject-server/trunk-import-openerp-thu into lp:openobject-server.
Requested reviews: OpenERP Core Team (openerp) For more details, see: https://code.launchpad.net/~openerp-dev/openobject-server/trunk-import-openerp-thu/+merge/140080 -- https://code.launchpad.net/~openerp-dev/openobject-server/trunk-import-openerp-thu/+merge/140080 Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/trunk-import-openerp-thu.
=== modified file 'openerp/addons/base/ir/ir_actions.py' --- openerp/addons/base/ir/ir_actions.py 2012-12-14 13:25:33 +0000 +++ openerp/addons/base/ir/ir_actions.py 2012-12-17 15:04:25 +0000 @@ -22,17 +22,16 @@ import logging import os import re +from socket import gethostname 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 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__) === modified file 'openerp/addons/base/ir/ir_attachment.py' --- openerp/addons/base/ir/ir_attachment.py 2012-11-26 18:15:27 +0000 +++ openerp/addons/base/ir/ir_attachment.py 2012-12-17 15:04:25 +0000 @@ -18,12 +18,9 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## - import itertools -from osv import fields,osv -from osv.orm import except_orm -import tools +from openerp.osv import fields,osv class ir_attachment(osv.osv): def check(self, cr, uid, ids, mode, context=None, values=None): === modified file 'openerp/addons/base/ir/ir_config_parameter.py' --- openerp/addons/base/ir/ir_config_parameter.py 2012-11-19 11:02:06 +0000 +++ openerp/addons/base/ir/ir_config_parameter.py 2012-12-17 15:04:25 +0000 @@ -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. === modified file 'openerp/addons/base/ir/ir_cron.py' --- openerp/addons/base/ir/ir_cron.py 2012-12-14 13:25:33 +0000 +++ openerp/addons/base/ir/ir_cron.py 2012-12-17 15:04:25 +0000 @@ -18,23 +18,18 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## - -import calendar import time import logging -import threading import psycopg2 from datetime import datetime from dateutil.relativedelta import relativedelta -import netsvc import openerp -import pooler -import tools -from osv import fields, osv -from tools import DEFAULT_SERVER_DATETIME_FORMAT -from tools.safe_eval import safe_eval as eval -from tools.translate import _ +from openerp import netsvc +from openerp.osv import fields, osv +from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT +from openerp.tools.safe_eval import safe_eval as eval +from openerp.tools.translate import _ _logger = logging.getLogger(__name__) === modified file 'openerp/addons/base/ir/ir_default.py' --- openerp/addons/base/ir/ir_default.py 2011-11-22 08:58:48 +0000 +++ openerp/addons/base/ir/ir_default.py 2012-12-17 15:04:25 +0000 @@ -19,7 +19,7 @@ # ############################################################################## -from osv import fields,osv +from openerp.osv import fields, osv class ir_default(osv.osv): _name = 'ir.default' === modified file 'openerp/addons/base/ir/ir_exports.py' --- openerp/addons/base/ir/ir_exports.py 2010-12-20 23:17:43 +0000 +++ openerp/addons/base/ir/ir_exports.py 2012-12-17 15:04:25 +0000 @@ -19,7 +19,7 @@ # ############################################################################## -from osv import fields,osv +from openerp.osv import fields,osv class ir_exports(osv.osv): === modified file 'openerp/addons/base/ir/ir_fields.py' --- openerp/addons/base/ir/ir_fields.py 2012-11-06 08:42:06 +0000 +++ openerp/addons/base/ir/ir_fields.py 2012-12-17 15:04:25 +0000 @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import collections import datetime import functools import operator === modified file 'openerp/addons/base/ir/ir_filters.py' --- openerp/addons/base/ir/ir_filters.py 2012-12-14 13:20:07 +0000 +++ openerp/addons/base/ir/ir_filters.py 2012-12-17 15:04:25 +0000 @@ -20,8 +20,8 @@ ############################################################################## from openerp import exceptions -from osv import osv, fields -from tools.translate import _ +from openerp.osv import osv, fields +from openerp.tools.translate import _ class ir_filters(osv.osv): _name = 'ir.filters' === modified file 'openerp/addons/base/ir/ir_mail_server.py' --- openerp/addons/base/ir/ir_mail_server.py 2012-12-14 13:07:58 +0000 +++ openerp/addons/base/ir/ir_mail_server.py 2012-12-17 15:04:25 +0000 @@ -31,8 +31,7 @@ import smtplib import threading -from osv import osv -from osv import fields +from openerp.osv import osv, fields from openerp.tools.translate import _ from openerp.tools import html2text import openerp.tools as tools === modified file 'openerp/addons/base/ir/ir_needaction.py' --- openerp/addons/base/ir/ir_needaction.py 2012-12-14 13:20:07 +0000 +++ openerp/addons/base/ir/ir_needaction.py 2012-12-17 15:04:25 +0000 @@ -19,7 +19,7 @@ # ############################################################################## -from osv import osv +from openerp.osv import osv class ir_needaction_mixin(osv.AbstractModel): === modified file 'openerp/addons/base/ir/ir_rule.py' --- openerp/addons/base/ir/ir_rule.py 2012-12-04 14:26:50 +0000 +++ openerp/addons/base/ir/ir_rule.py 2012-12-17 15:04:25 +0000 @@ -18,15 +18,13 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## - -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' === modified file 'openerp/addons/base/ir/ir_sequence.py' --- openerp/addons/base/ir/ir_sequence.py 2012-12-14 13:25:33 +0000 +++ openerp/addons/base/ir/ir_sequence.py 2012-12-17 15:04:25 +0000 @@ -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__) === modified file 'openerp/addons/base/ir/ir_translation.py' --- openerp/addons/base/ir/ir_translation.py 2012-12-14 13:21:13 +0000 +++ openerp/addons/base/ir/ir_translation.py 2012-12-17 15:04:25 +0000 @@ -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__) === modified file 'openerp/addons/base/ir/ir_ui_menu.py' --- openerp/addons/base/ir/ir_ui_menu.py 2012-12-17 11:01:50 +0000 +++ openerp/addons/base/ir/ir_ui_menu.py 2012-12-17 15:04:25 +0000 @@ -23,11 +23,11 @@ import base64 import re import threading -from tools.safe_eval import safe_eval as eval -import tools +from openerp.tools.safe_eval import safe_eval as eval +from openerp import tools import openerp.modules -from osv import fields, osv -from tools.translate import _ +from openerp.osv import fields, osv +from openerp.tools.translate import _ from openerp import SUPERUSER_ID def one_in(setA, setB): === modified file 'openerp/addons/base/ir/ir_ui_view.py' --- openerp/addons/base/ir/ir_ui_view.py 2012-12-14 13:19:24 +0000 +++ openerp/addons/base/ir/ir_ui_view.py 2012-12-17 15:04:25 +0000 @@ -19,14 +19,15 @@ # ############################################################################## -from osv import fields,osv +import logging 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 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__) === modified file 'openerp/addons/base/ir/ir_values.py' --- openerp/addons/base/ir/ir_values.py 2012-12-14 13:25:33 +0000 +++ openerp/addons/base/ir/ir_values.py 2012-12-17 15:04:25 +0000 @@ -18,11 +18,10 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## - -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 EXCLUDED_FIELDS = set(( 'report_sxw_content', 'report_rml_content', 'report_sxw', 'report_rml', === modified file 'openerp/addons/base/ir/wizard/wizard_menu.py' --- openerp/addons/base/ir/wizard/wizard_menu.py 2012-10-03 16:18:07 +0000 +++ openerp/addons/base/ir/wizard/wizard_menu.py 2012-12-17 15:04:25 +0000 @@ -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' === modified file 'openerp/addons/base/ir/workflow/print_instance.py' --- openerp/addons/base/ir/workflow/print_instance.py 2012-12-14 13:25:33 +0000 +++ openerp/addons/base/ir/workflow/print_instance.py 2012-12-17 15:04:25 +0000 @@ -18,13 +18,11 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## - import logging -import time, os - -import netsvc -import report,pooler,tools from operator import itemgetter +import os + +from openerp import report, tools _logger = logging.getLogger(__name__) === modified file 'openerp/addons/base/module/module.py' --- openerp/addons/base/module/module.py 2012-12-11 18:53:10 +0000 +++ openerp/addons/base/module/module.py 2012-12-17 15:04:25 +0000 @@ -18,9 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## - -import base64 -from docutils import io, nodes +from docutils import nodes from docutils.core import publish_string from docutils.transforms import Transform, writer_aux from docutils.writers.html4css1 import Writer === modified file 'openerp/addons/base/module/report/ir_module_reference_print.py' --- openerp/addons/base/module/report/ir_module_reference_print.py 2010-12-10 22:42:58 +0000 +++ openerp/addons/base/module/report/ir_module_reference_print.py 2012-12-17 15:04:25 +0000 @@ -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): === modified file 'openerp/addons/base/module/wizard/base_export_language.py' --- openerp/addons/base/module/wizard/base_export_language.py 2012-11-24 02:32:26 +0000 +++ openerp/addons/base/module/wizard/base_export_language.py 2012-12-17 15:04:25 +0000 @@ -19,12 +19,13 @@ # ############################################################################## -import tools import base64 import cStringIO -from osv import fields,osv -from tools.translate import _ -from tools.misc import get_iso_codes + +from openerp import tools +from openerp.osv import fields,osv +from openerp.tools.translate import _ +from openerp.tools.misc import get_iso_codes NEW_LANG_KEY = '__new__' === modified file 'openerp/addons/base/module/wizard/base_import_language.py' --- openerp/addons/base/module/wizard/base_import_language.py 2012-10-01 15:44:49 +0000 +++ openerp/addons/base/module/wizard/base_import_language.py 2012-12-17 15:04:25 +0000 @@ -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 """ === modified file 'openerp/addons/base/module/wizard/base_language_install.py' --- openerp/addons/base/module/wizard/base_language_install.py 2012-10-12 12:24:19 +0000 +++ openerp/addons/base/module/wizard/base_language_install.py 2012-12-17 15:04:25 +0000 @@ -19,9 +19,9 @@ # ############################################################################## -import tools -from osv import osv, fields -from tools.translate import _ +from openerp import tools +from openerp.osv import osv, fields +from openerp.tools.translate import _ class base_language_install(osv.osv_memory): """ Install Language""" === modified file 'openerp/addons/base/module/wizard/base_module_configuration.py' --- openerp/addons/base/module/wizard/base_module_configuration.py 2011-07-14 10:38:07 +0000 +++ openerp/addons/base/module/wizard/base_module_configuration.py 2012-12-17 15:04:25 +0000 @@ -19,8 +19,8 @@ # ############################################################################## -from osv import osv -from tools.translate import _ +from openerp.osv import osv +from openerp.tools.translate import _ class base_module_configuration(osv.osv_memory): === modified file 'openerp/addons/base/module/wizard/base_module_import.py' --- openerp/addons/base/module/wizard/base_module_import.py 2012-10-12 12:24:19 +0000 +++ openerp/addons/base/module/wizard/base_module_import.py 2012-12-17 15:04:25 +0000 @@ -19,14 +19,14 @@ # ############################################################################## +import base64 import os -import tools - +from StringIO import StringIO import zipfile -from StringIO import StringIO -import base64 -from tools.translate import _ -from osv import osv, fields + +from openerp import tools +from openerp.osv import osv, fields +from openerp.tools.translate import _ ADDONS_PATH = tools.config['addons_path'].split(",")[-1] === added file 'openerp/addons/base/module/wizard/base_module_scan.py' --- openerp/addons/base/module/wizard/base_module_scan.py 1970-01-01 00:00:00 +0000 +++ openerp/addons/base/module/wizard/base_module_scan.py 2012-12-17 15:04:25 +0000 @@ -0,0 +1,74 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +############################################################################## +import os +import glob +import imp +import zipfile + +from openerp import tools +from openerp.osv import osv + +class base_module_scan(osv.osv_memory): + """ scan module """ + + _name = "base.module.scan" + _description = "scan module" + + def watch_dir(self, cr, uid, ids, context): + mod_obj = self.pool.get('ir.module.module') + all_mods = mod_obj.read(cr, uid, mod_obj.search(cr, uid, []), ['name', 'state']) + known_modules = [x['name'] for x in all_mods] + ls_ad = glob.glob(os.path.join(tools.config['addons_path'], '*', '__terp__.py')) + modules = [module_name_re.match(name).group(1) for name in ls_ad] + for fname in os.listdir(tools.config['addons_path']): + if zipfile.is_zipfile(fname): + modules.append( fname.split('.')[0]) + for module in modules: + if module in known_modules: + continue + terp = mod_obj.get_module_info(module) + if not terp.get('installable', True): + continue + + # XXX check if this code is correct... + fm = imp.find_module(module) + try: + imp.load_module(module, *fm) + finally: + if fm[0]: + fm[0].close() + + values = mod_obj.get_values_from_terp(terp) + mod_id = mod_obj.create(cr, uid, dict(name=module, state='uninstalled', **values)) + dependencies = terp.get('depends', []) + for d in dependencies: + cr.execute('insert into ir_module_module_dependency (module_id,name) values (%s, %s)', (mod_id, d)) + for module in known_modules: + terp = mod_obj.get_module_info(module) + if terp.get('installable', True): + for mod in all_mods: + if mod['name'] == module and mod['state'] == 'uninstallable': + mod_obj.write(cr, uid, [mod['id']], {'state': 'uninstalled'}) + return {} + +base_module_scan() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: === modified file 'openerp/addons/base/module/wizard/base_module_update.py' --- openerp/addons/base/module/wizard/base_module_update.py 2012-10-12 12:24:19 +0000 +++ openerp/addons/base/module/wizard/base_module_update.py 2012-12-17 15:04:25 +0000 @@ -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 @@ } return res -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: === modified file 'openerp/addons/base/module/wizard/base_update_translations.py' --- openerp/addons/base/module/wizard/base_update_translations.py 2012-09-28 12:22:06 +0000 +++ openerp/addons/base/module/wizard/base_update_translations.py 2012-12-17 15:04:25 +0000 @@ -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): === modified file 'openerp/addons/base/report/preview_report.py' --- openerp/addons/base/report/preview_report.py 2011-07-06 16:16:06 +0000 +++ openerp/addons/base/report/preview_report.py 2012-12-17 15:04:25 +0000 @@ -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): === modified file 'openerp/addons/base/res/__init__.py' --- openerp/addons/base/res/__init__.py 2012-10-22 05:40:24 +0000 +++ openerp/addons/base/res/__init__.py 2012-12-17 15:04:25 +0000 @@ -19,8 +19,6 @@ # ############################################################################## -import tools - import res_country import res_lang import res_partner === modified file 'openerp/addons/base/res/ir_property.py' --- openerp/addons/base/res/ir_property.py 2012-03-22 16:58:37 +0000 +++ openerp/addons/base/res/ir_property.py 2012-12-17 15:04:25 +0000 @@ -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 # ------------------------------------------------------------------------- === modified file 'openerp/addons/base/res/res_bank.py' --- openerp/addons/base/res/res_bank.py 2012-11-02 09:47:05 +0000 +++ openerp/addons/base/res/res_bank.py 2012-12-17 15:04:25 +0000 @@ -19,8 +19,8 @@ # ############################################################################## -from osv import fields, osv -from tools.translate import _ +from openerp.osv import fields, osv +from openerp.tools.translate import _ class Bank(osv.osv): _description='Bank' === modified file 'openerp/addons/base/res/res_company.py' --- openerp/addons/base/res/res_company.py 2012-12-15 19:26:06 +0000 +++ openerp/addons/base/res/res_company.py 2012-12-17 15:04:25 +0000 @@ -18,15 +18,15 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## + import os import openerp -from openerp import SUPERUSER_ID -from openerp.osv import osv, fields -from openerp import tools +from openerp import SUPERUSER_ID, tools +from openerp.osv import fields, osv +from openerp.tools.translate import _ +from openerp.tools.safe_eval import safe_eval as eval from openerp.tools import image_resize_image -from tools.translate import _ -from tools.safe_eval import safe_eval as eval class multi_company_default(osv.osv): """ === modified file 'openerp/addons/base/res/res_config.py' --- openerp/addons/base/res/res_config.py 2012-12-14 12:38:03 +0000 +++ openerp/addons/base/res/res_config.py 2012-12-17 15:04:25 +0000 @@ -19,13 +19,12 @@ # ############################################################################## import logging -from operator import attrgetter, itemgetter +from operator import attrgetter -from osv import osv, fields -from tools.translate import _ -import netsvc -from tools import ustr -import pooler +from openerp import pooler +from openerp.osv import osv, fields +from openerp.tools import ustr +from openerp.tools.translate import _ _logger = logging.getLogger(__name__) === modified file 'openerp/addons/base/res/res_country.py' --- openerp/addons/base/res/res_country.py 2012-10-26 06:51:43 +0000 +++ openerp/addons/base/res/res_country.py 2012-12-17 15:04:25 +0000 @@ -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): === modified file 'openerp/addons/base/res/res_currency.py' --- openerp/addons/base/res/res_currency.py 2012-12-14 12:38:03 +0000 +++ openerp/addons/base/res/res_currency.py 2012-12-17 15:04:25 +0000 @@ -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 tools.translate import _ +from openerp import tools +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*(?:\((.*)\))?') === modified file 'openerp/addons/base/res/res_lang.py' --- openerp/addons/base/res/res_lang.py 2012-12-14 12:38:03 +0000 +++ openerp/addons/base/res/res_lang.py 2012-12-17 15:04:25 +0000 @@ -20,14 +20,14 @@ ############################################################################## import locale +from locale import localeconv import logging import re -from osv import fields, osv -from locale import localeconv -import tools -from tools.safe_eval import safe_eval as eval -from tools.translate import _ +from openerp import tools +from openerp.osv import fields, osv +from openerp.tools.safe_eval import safe_eval as eval +from openerp.tools.translate import _ _logger = logging.getLogger(__name__) === modified file 'openerp/addons/base/res/res_partner.py' --- openerp/addons/base/res/res_partner.py 2012-12-17 11:01:50 +0000 +++ openerp/addons/base/res/res_partner.py 2012-12-17 15:04:25 +0000 @@ -20,17 +20,16 @@ ############################################################################## import datetime +from lxml import etree import math +import pytz +import re + 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 +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={}): === modified file 'openerp/addons/base/res/res_request.py' --- openerp/addons/base/res/res_request.py 2012-12-14 12:38:03 +0000 +++ openerp/addons/base/res/res_request.py 2012-12-17 15:04:25 +0000 @@ -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) === modified file 'openerp/addons/base/res/res_users.py' --- openerp/addons/base/res/res_users.py 2012-12-12 21:01:37 +0000 +++ openerp/addons/base/res/res_users.py 2012-12-17 15:04:25 +0000 @@ -19,23 +19,18 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## - - from functools import partial import logging from lxml import etree from lxml.builder import E -import netsvc + +import openerp from openerp import SUPERUSER_ID -import openerp +from openerp import pooler, tools import openerp.exceptions -from osv import fields,osv -from osv.orm import browse_record -import pooler -import random -from service import security -import tools -from tools.translate import _ +from openerp.osv import fields,osv +from openerp.osv.orm import browse_record +from openerp.tools.translate import _ _logger = logging.getLogger(__name__) === modified file 'openerp/addons/base/tests/test_menu.py' --- openerp/addons/base/tests/test_menu.py 2012-12-13 14:58:21 +0000 +++ openerp/addons/base/tests/test_menu.py 2012-12-17 15:04:25 +0000 @@ -1,5 +1,3 @@ -import unittest2 - import openerp.tests.common as common class test_menu(common.TransactionCase): === modified file 'openerp/addons/base_quality_interrogation.py' --- openerp/addons/base_quality_interrogation.py 2012-12-14 12:38:03 +0000 +++ openerp/addons/base_quality_interrogation.py 2012-12-17 15:04:25 +0000 @@ -20,14 +20,11 @@ ############################################################################## import xmlrpclib -import ConfigParser import optparse import sys -import thread import threading import os import time -import pickle import base64 import socket import string === modified file 'openerp/tests/test_fields.py' --- openerp/tests/test_fields.py 2012-12-12 15:15:09 +0000 +++ openerp/tests/test_fields.py 2012-12-17 15:04:25 +0000 @@ -1,11 +1,8 @@ # # test cases for fields access, etc. # - -import unittest2 import common -import openerp from openerp.osv import fields class TestRelatedField(common.TransactionCase): === modified file 'openerp/tests/test_ir_filters.py' --- openerp/tests/test_ir_filters.py 2012-11-08 09:29:07 +0000 +++ openerp/tests/test_ir_filters.py 2012-12-17 15:04:25 +0000 @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- import functools -import openerp from openerp import exceptions from . import common @@ -261,4 +260,4 @@ self.assertItemsEqual(map(noid, filters), [ dict(name='a', user_id=False, is_default=False, domain='[]', context='{}'), dict(name='b', user_id=False, is_default=True, domain='[]', context=context_value), - ]) \ No newline at end of file + ]) === modified file 'openerp/tests/test_orm.py' --- openerp/tests/test_orm.py 2012-12-11 18:46:24 +0000 +++ openerp/tests/test_orm.py 2012-12-17 15:04:25 +0000 @@ -1,4 +1,3 @@ -from openerp import exceptions from openerp.tools import mute_logger import common === modified file 'openerp/tests/test_uninstall.py' --- openerp/tests/test_uninstall.py 2012-06-20 10:07:05 +0000 +++ openerp/tests/test_uninstall.py 2012-12-17 15:04:25 +0000 @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- # This assumes an existing but uninitialized database. -import psycopg2 import unittest2 import openerp === modified file 'openerp/tests/test_view_validation.py' --- openerp/tests/test_view_validation.py 2012-08-07 11:48:30 +0000 +++ openerp/tests/test_view_validation.py 2012-12-17 15:04:25 +0000 @@ -1,11 +1,9 @@ # This test can be run stand-alone with something like: # > PYTHONPATH=. python2 openerp/tests/test_view_validation.py - from lxml import etree from StringIO import StringIO import unittest2 -import openerp from openerp.tools.view_validation import * invalid_form = etree.parse(StringIO('''\ === modified file 'openerp/tests/test_xmlrpc.py' --- openerp/tests/test_xmlrpc.py 2012-10-22 12:17:18 +0000 +++ openerp/tests/test_xmlrpc.py 2012-12-17 15:04:25 +0000 @@ -10,7 +10,6 @@ import unittest2 import xmlrpclib -import openerp import common DB = None === modified file 'openerp/tools/convert.py' --- openerp/tools/convert.py 2012-12-14 12:38:03 +0000 +++ openerp/tools/convert.py 2012-12-17 15:04:25 +0000 @@ -46,7 +46,6 @@ from datetime import datetime, timedelta from lxml import etree import misc -import openerp.loglevels as loglevels import openerp.pooler as pooler from config import config from translate import _ === modified file 'openerp/tools/image.py' --- openerp/tools/image.py 2012-12-15 21:32:19 +0000 +++ openerp/tools/image.py 2012-12-17 15:04:25 +0000 @@ -23,7 +23,7 @@ import StringIO from PIL import Image -from PIL import ImageEnhance, ImageOps +from PIL import ImageOps from random import random # ---------------------------------------- === modified file 'openerp/tools/misc.py' --- openerp/tools/misc.py 2012-12-14 13:44:55 +0000 +++ openerp/tools/misc.py 2012-12-17 15:04:25 +0000 @@ -42,6 +42,7 @@ from lxml import etree from which import which from threading import local + try: from html2text import html2text except ImportError: === modified file 'openerp/tools/safe_eval.py' --- openerp/tools/safe_eval.py 2012-10-17 15:55:26 +0000 +++ openerp/tools/safe_eval.py 2012-12-17 15:04:25 +0000 @@ -34,7 +34,6 @@ from opcode import HAVE_ARGUMENT, opmap, opname from types import CodeType import logging -import os __all__ = ['test_expr', 'safe_eval', 'const_eval'] === modified file 'openerp/workflow/instance.py' --- openerp/workflow/instance.py 2011-02-07 12:57:23 +0000 +++ openerp/workflow/instance.py 2012-12-17 15:04:25 +0000 @@ -18,13 +18,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## - -import wkf_logs import workitem -import openerp.netsvc as netsvc -import openerp.pooler as pooler - def create(cr, ident, wkf_id): (uid,res_type,res_id) = ident cr.execute('insert into wkf_instance (res_type,res_id,uid,wkf_id) values (%s,%s,%s,%s) RETURNING id', (res_type,res_id,uid,wkf_id)) === modified file 'openerp/workflow/wkf_expr.py' --- openerp/workflow/wkf_expr.py 2012-11-28 15:06:37 +0000 +++ openerp/workflow/wkf_expr.py 2012-12-17 15:04:25 +0000 @@ -19,9 +19,6 @@ # ############################################################################## -import sys -import openerp.netsvc as netsvc -import openerp.osv as base import openerp.pooler as pooler from openerp.tools.safe_eval import safe_eval as eval === modified file 'openerp/workflow/wkf_logs.py' --- openerp/workflow/wkf_logs.py 2012-01-24 17:30:17 +0000 +++ openerp/workflow/wkf_logs.py 2012-12-17 15:04:25 +0000 @@ -22,7 +22,6 @@ # # May be uncommented to logs workflows modifications # -import openerp.netsvc as netsvc def log(cr,ident,act_id,info=''): return === modified file 'openerp/workflow/wkf_service.py' --- openerp/workflow/wkf_service.py 2011-09-24 14:52:58 +0000 +++ openerp/workflow/wkf_service.py 2012-12-17 15:04:25 +0000 @@ -18,13 +18,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## - -import wkf_logs -import workitem import instance - import openerp.netsvc as netsvc -import openerp.pooler as pooler class workflow_service(netsvc.Service): """ === modified file 'openerp/workflow/workitem.py' --- openerp/workflow/workitem.py 2012-12-14 12:38:03 +0000 +++ openerp/workflow/workitem.py 2012-12-17 15:04:25 +0000 @@ -24,7 +24,6 @@ # cr.execute('delete from wkf_triggers where model=%s and res_id=%s', (res_type,res_id)) # -import openerp.netsvc as netsvc import instance import wkf_expr
_______________________________________________ Mailing list: https://launchpad.net/~openerp-dev-gtk Post to : openerp-dev-gtk@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-dev-gtk More help : https://help.launchpad.net/ListHelp
