Merge pull request #3891 from nsoranzo/python3

Python3: Use shlex_quote() from six.moves instead of pipes.quote()
This commit is contained in:
Björn Grüning
2017-04-06 20:01:10 +02:00
committed by GitHub
+2 -2
View File
@@ -1,9 +1,9 @@
import logging
import os
import pipes
import tempfile
from six import string_types
from six.moves import shlex_quote
from galaxy import exceptions
from galaxy.util import odict
@@ -41,7 +41,7 @@ class ToolParameterValueWrapper( object ):
"""
rval = self.input.value_to_display_text( self.value, self.input.tool.app ) or ''
if quote:
return pipes.quote( rval ) or "''" # pipes.quote in Python < 2.7 returns an empty string instead of the expected quoted empty string
return shlex_quote( rval )
return rval