From f65509f1ce492b760b10433ce8d383f970755c79 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Thu, 19 Jan 2012 22:55:53 +0100 Subject: [PATCH 1/5] [FIX] AttributeError, 'module' has no attribute 'ext_eval' bzr revid: florent.xicluna@gmail.com-20120119215553-qlb4992c37vi6cuh --- openerp/tools/safe_eval.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/tools/safe_eval.py b/openerp/tools/safe_eval.py index 4a28d9de016..5bf65e609c4 100644 --- a/openerp/tools/safe_eval.py +++ b/openerp/tools/safe_eval.py @@ -36,7 +36,7 @@ from types import CodeType import logging import os -__all__ = ['test_expr', 'safe_eval', 'const_eval', 'ext_eval' ] +__all__ = ['test_expr', 'safe_eval', 'const_eval'] # The time module is usually already provided in the safe_eval environment # but some code, e.g. datetime.datetime.now() (Windows/Python 2.5.2, bug From 9d2ccc5aef60e001152194b229aca8d5401152a7 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Thu, 19 Jan 2012 22:57:58 +0100 Subject: [PATCH 2/5] [FIX] eval(label) fails if label is not a str. bzr revid: florent.xicluna@gmail.com-20120119215758-yflsp1cjz997o2r8 --- openerp/addons/base/ir/ir_ui_view.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py index 996053bd35c..767d71b76b0 100644 --- a/openerp/addons/base/ir/ir_ui_view.py +++ b/openerp/addons/base/ir/ir_ui_view.py @@ -125,7 +125,7 @@ class view(osv.osv): def graph_get(self, cr, uid, id, model, node_obj, conn_obj, src_node, des_node, label, scale, context=None): if not label: - label = [] + label = '[]' nodes=[] nodes_name=[] transitions=[] From d2532fddf2ca982742b7b30bd22ae0a180be8a25 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Thu, 19 Jan 2012 22:59:35 +0100 Subject: [PATCH 3/5] [FIX] missing import. bzr revid: florent.xicluna@gmail.com-20120119215935-fqb9gnwt41yyd6yt --- openerp/addons/base/module/wizard/base_update_translations.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openerp/addons/base/module/wizard/base_update_translations.py b/openerp/addons/base/module/wizard/base_update_translations.py index 0a9f5e9cca9..d24851b1cd5 100644 --- a/openerp/addons/base/module/wizard/base_update_translations.py +++ b/openerp/addons/base/module/wizard/base_update_translations.py @@ -23,6 +23,7 @@ from osv import osv, fields import tools import pooler import cStringIO +from tools.translate import _ class base_update_translations(osv.osv_memory): def _get_languages(self, cr, uid, context): From 521152816ee4f6541261c8370bdc155f8b40cbc2 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Thu, 19 Jan 2012 22:59:55 +0100 Subject: [PATCH 4/5] [FIX] missing import. bzr revid: florent.xicluna@gmail.com-20120119215955-5692tc3lv5q6su4l --- openerp/report/render/rml2txt/utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openerp/report/render/rml2txt/utils.py b/openerp/report/render/rml2txt/utils.py index 122411afb2d..174612d847e 100644 --- a/openerp/report/render/rml2txt/utils.py +++ b/openerp/report/render/rml2txt/utils.py @@ -19,6 +19,7 @@ # ############################################################################## +import copy import re import reportlab import reportlab.lib.units From fd9bb5a1363233da1dbf6a0de051f8d4abb173a2 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Thu, 19 Jan 2012 23:00:41 +0100 Subject: [PATCH 5/5] [FIX] tools.misc: NameError during exception handling. bzr revid: florent.xicluna@gmail.com-20120119220041-w0o5q6cusz9zfnt2 --- openerp/tools/misc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py index 6739f45cc5a..de1c1a1eab2 100644 --- a/openerp/tools/misc.py +++ b/openerp/tools/misc.py @@ -386,7 +386,7 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non smtp_server=smtp_server, smtp_port=smtp_port, smtp_user=smtp_user, smtp_password=smtp_password, smtp_encryption=('ssl' if ssl else None), debug=debug) except Exception: - _log.exception("tools.email_send failed to deliver email") + _logger.exception("tools.email_send failed to deliver email") return False finally: cr.close()