From 5f7f25ad3ad5d4669b0cdc0fd1efc653a65e491d Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Mon, 13 Jan 2020 15:14:59 +0100 Subject: [PATCH 3/3] visualization: use formatting instead of unicode() (#38908) --- bijoe/visualization/utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bijoe/visualization/utils.py b/bijoe/visualization/utils.py index 97b5c18..6b9358e 100644 --- a/bijoe/visualization/utils.py +++ b/bijoe/visualization/utils.py @@ -244,7 +244,7 @@ class Visualization(object): table[-1].append(_('Total')) for y in y_axis: table.append([y.label]) - table[-1].extend(unicode(grid[(x.id, y.id)]) for x in x_axis) + table[-1].extend('%s' % (grid[(x.id, y.id)],) for x in x_axis) # line sums if compute_lines_sums: table[-1].append(sums_lines[y.id]) @@ -259,17 +259,17 @@ class Visualization(object): table.append([self.measure.label]) for x in x_axis: table[0].append(x.label) - table[1].append(unicode(grid[x.id])), + table[1].append('%s' % (grid[x.id],)), elif self.drilldown_y: y_axis, grid = self.table_1d() table.append([self.drilldown_y.label, self.measure.label]) for y in y_axis: table.append([ y.label, - unicode(grid[y.id]), + '%s' % (grid[y.id],), ]) else: - table.append([self.measure.label, unicode(self.data()[0].measures[0])]) + table.append([self.measure.label, '%s' % (self.data()[0].measures[0],)]) for row in table: for cell in row: -- 2.24.0