From cde04ad52d40b5d7b26a0c636d9d24bf6adbdc92 Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Tue, 12 Apr 2016 15:37:06 +0100 Subject: [PATCH] markupsafe.escape() in Python2 does not work on str containing non-ASCII characters. Fix #2135. --- lib/galaxy/web/framework/helpers/grids.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/web/framework/helpers/grids.py b/lib/galaxy/web/framework/helpers/grids.py index ad63ce01673..ff82259e141 100644 --- a/lib/galaxy/web/framework/helpers/grids.py +++ b/lib/galaxy/web/framework/helpers/grids.py @@ -2,7 +2,7 @@ import logging import math from galaxy.model.item_attrs import RuntimeException, UsesAnnotations, UsesItemRatings -from galaxy.util import sanitize_text +from galaxy.util import sanitize_text, unicodify from galaxy.util.json import loads, dumps from galaxy.util.odict import odict from galaxy.web.framework import decorators @@ -371,7 +371,7 @@ class GridColumn( object ): value = None if self.format: value = self.format( value ) - return escape(value) + return escape(unicodify(value)) def get_link( self, trans, grid, item ): if self.link and self.link( item ):