From 232e8096925dd7739b98120c172b5cb092192f3e Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Thu, 6 Apr 2017 13:52:32 +0100 Subject: [PATCH] Python3: Use shlex_quote() from six.moves instead of pipes.quote() --- lib/galaxy/tools/wrappers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/tools/wrappers.py b/lib/galaxy/tools/wrappers.py index 7e0631eeff2..72d2fab9be4 100644 --- a/lib/galaxy/tools/wrappers.py +++ b/lib/galaxy/tools/wrappers.py @@ -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