1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/19309418c864/ Changeset: 19309418c864 User: jmchilton Date: 2014-08-12 14:19:04 Summary: Fix multi-page tool help parsing. Patch thanks to Hans-Philipp Brachvogel. Affected #: 2 files
diff -r 700560884da71e8bd3bdad6ddbe4edfde9566f7f -r 19309418c86450b7f39691460eb430e100883cb4 lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -1482,10 +1482,10 @@ 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( rst_to_html( help_header + x + help_footer, + self.help_by_page = [ Template( rst_to_html( help_header + x + help_footer ), input_encoding='utf-8', output_encoding='utf-8', default_filters=[ 'decode.utf8' ], - encoding_errors='replace' ) ) + encoding_errors='replace' ) for x in self.help_by_page ] except: log.exception( "error in multi-page help for tool %s" % self.name )
diff -r 700560884da71e8bd3bdad6ddbe4edfde9566f7f -r 19309418c86450b7f39691460eb430e100883cb4 test/functional/tools/multi_page.xml --- a/test/functional/tools/multi_page.xml +++ b/test/functional/tools/multi_page.xml @@ -14,6 +14,10 @@ <outputs><data format="txt" name="output" /></outputs> + <help> + <page>Page 1 Help.</page> + <page>Page 2 Help.</page> + </help><tests><test><param name="p1" value="3" />
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.