Projet

Général

Profil

0003-visualization-use-formatting-instead-of-unicode-3890.patch

Benjamin Dauvergne, 13 janvier 2020 15:15

Télécharger (1,81 ko)

Voir les différences: 

Subject: [PATCH 3/3] visualization: use formatting instead of unicode()
 (#38908)


 bijoe/visualization/utils.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
bijoe/visualization/utils.py
244 244 
                table[-1].append(_('Total'))
245 245 
            for y in y_axis:
246 246 
                table.append([y.label])
247 
                table[-1].extend(unicode(grid[(x.id, y.id)]) for x in x_axis)
247 
                table[-1].extend('%s' % (grid[(x.id, y.id)],) for x in x_axis)
248 248 
                # line sums
249 249 
                if compute_lines_sums:
250 250 
                    table[-1].append(sums_lines[y.id])
......
259 259 
            table.append([self.measure.label])
260 260 
            for x in x_axis:
261 261 
                table[0].append(x.label)
262 
                table[1].append(unicode(grid[x.id])),
262 
                table[1].append('%s' % (grid[x.id],)),
263 263 
        elif self.drilldown_y:
264 264 
            y_axis, grid = self.table_1d()
265 265 
            table.append([self.drilldown_y.label, self.measure.label])
266 266 
            for y in y_axis:
267 267 
                table.append([
268 268 
                    y.label,
269 
                    unicode(grid[y.id]),
269 
                    '%s' % (grid[y.id],),
270 270 
                ])
271 271 
        else:
272 
            table.append([self.measure.label, unicode(self.data()[0].measures[0])])
272 
            table.append([self.measure.label, '%s' % (self.data()[0].measures[0],)])
273 273 

  		




  274
  274
  
    
        for row in table:

  		




  275
  275
  
    
            for cell in row:

  		




  276
  
  
    
-