Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/6.0-bug-793106-xrg into lp:openobject-server/6.0

  1. 6.0-bug-793106-xrg
  2. Merge into 6.0
Proposed by xrg
Status: Merged
Approved by: Jay Vora (Serpent Consulting Services)
Approved revision: 3439
Merged at revision: 3442
Proposed branch: lp:~openerp-dev/openobject-server/6.0-bug-793106-xrg
Merge into: lp:openobject-server/6.0
Diff against target: 12 lines (+1/-1)
1 file modified
bin/tools/yaml_import.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/6.0-bug-793106-xrg
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+63485@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/tools/yaml_import.py'
2--- bin/tools/yaml_import.py 2011-01-04 10:13:35 +0000
3+++ bin/tools/yaml_import.py 2011-06-05 11:40:51 +0000
4@@ -106,7 +106,7 @@
5 success += self._report[severity][True]
6 failure += self._report[severity][False]
7 res.append("total\t%s\t%s" % (success, failure))
8- res.append("end of report (%s assertion(s) checked)" % success + failure)
9+ res.append("end of report (%s assertion(s) checked)" % (success + failure))
10 return "\n".join(res)
11
12 class RecordDictWrapper(dict):