opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Explicitly specify encodings for tool help templates to avoid unicode/ascii confusion.

Browse Source
This commit is contained in:
Jeremy Goecks
2012-08-10 12:26:43 -04:00
parent 2a1bbec58f
commit 0881708333
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/__init__.py
+7 -2
View File
@@ -1083,7 +1083,9 @@ class Tool:
help_pages = self.help.findall( "page" )
help_header = self.help.text
try:
self.help = Template( util.rst_to_html(self.help.text) )
self.help = Template( util.rst_to_html(self.help.text), input_encoding='utf-8',
output_encoding='utf-8', default_filters=[ 'decode.utf8' ],
encoding_errors='replace' )
except:
log.exception( "error in help for tool %s" % self.name )
# Multiple help page case
@@ -1093,7 +1095,10 @@ class Tool:
help_footer = help_footer + help_page.tail
# Each page has to rendered all-together because of backreferences allowed by rst
try:
self.help_by_page = [ Template( util.rst_to_html( help_header + x + help_footer ) )
self.help_by_page = [ Template( util.rst_to_html( help_header + x + help_footer,
input_encoding='utf-8', output_encoding='utf-8',
default_filters=[ 'decode.utf8' ],
encoding_errors='replace' ) )
for x in self.help_by_page ]
except:
log.exception( "error in multi-page help for tool %s" % self.name )