diff options
| author | Olivier Dony <odo@openerp.com> | 2012-02-14 16:00:22 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2012-02-14 16:00:22 +0100 |
| commit | 79ac080fb2c24d89f2bb06d61e350fa079e5bc4c (patch) | |
| tree | c87adb6a9ac5a57c9f141b13f23b0a6714e95cc2 | |
| parent | 8b4c62c624208f875a52494bf3b8030a411dc8bb (diff) | |
| parent | 505689909344b9fe4d163ced32542a6d1daab4d4 (diff) | |
[MERGE] Minor bugfixes (missing imports, etc.) courtesy of Florent Xicluna
bzr revid: odo@openerp.com-20120214150022-yx6zi0j4fr2d48uc
| -rw-r--r-- | openerp/addons/base/ir/ir_ui_view.py | 2 | ||||
| -rw-r--r-- | openerp/addons/base/module/wizard/base_update_translations.py | 1 | ||||
| -rw-r--r-- | openerp/report/render/rml2txt/utils.py | 1 | ||||
| -rw-r--r-- | openerp/tools/safe_eval.py | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py index 6c9463b671e..8fcb794b08e 100644 --- a/openerp/addons/base/ir/ir_ui_view.py +++ b/openerp/addons/base/ir/ir_ui_view.py @@ -125,8 +125,6 @@ class view(osv.osv): return result def graph_get(self, cr, uid, id, model, node_obj, conn_obj, src_node, des_node, label, scale, context=None): - if not label: - label = [] nodes=[] nodes_name=[] transitions=[] 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): 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 diff --git a/openerp/tools/safe_eval.py b/openerp/tools/safe_eval.py index c7ded2923ed..a542fa44a42 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 |