Switch back to pipes.quote

dbieber · copybara-github · commit 925ae49420cb · 2019-04-16T16:44:04.000-07:00
PiperOrigin-RevId: 243904197
Change-Id: Ie15e9db18da83b5602e6ccac171990166ac1b9e9
diff --git a/fire/core.py b/fire/core.py
@@ -56,6 +56,7 @@ def main(argv):
 import inspect
 import json
 import os
+import pipes
 import re
 import shlex
 import sys
@@ -232,7 +233,7 @@ def _IsHelpShortcut(component_trace, remaining_args):
     component_trace.show_help = True
     command = '{cmd} -- --help'.format(cmd=component_trace.GetCommand())
     print('INFO: Showing help with the command {cmd}.\n'.format(
-        cmd=six.moves.shlex_quote(command)), file=sys.stderr)
+        cmd=pipes.quote(command)), file=sys.stderr)
   return show_help
 
 
@@ -264,7 +265,7 @@ def _DisplayError(component_trace):
     if help_flag in component_trace.elements[-1].args:
       command = '{cmd} -- --help'.format(cmd=component_trace.GetCommand())
       message = 'INFO: Showing help with the command {cmd}.\n'.format(
-          cmd=six.moves.shlex_quote(command))
+          cmd=pipes.quote(command))
       output.append(message)
   output.append('Fire trace:\n{trace}\n'.format(trace=component_trace))
   result = component_trace.GetResult()
diff --git a/fire/trace.py b/fire/trace.py
@@ -29,8 +29,9 @@
 from __future__ import division
 from __future__ import print_function
 
+import pipes
+
 from fire import inspectutils
-import six
 
 INITIAL_COMPONENT = 'Initial component'
 INSTANTIATED_CLASS = 'Instantiated class'
@@ -165,8 +166,8 @@ def display(arg1, arg2='!'):
   def _Quote(self, arg):
     if arg.startswith('--') and '=' in arg:
       prefix, value = arg.split('=', 1)
-      return six.moves.shlex_quote(prefix) + '=' + six.moves.shlex_quote(value)
-    return six.moves.shlex_quote(arg)
+      return pipes.quote(prefix) + '=' + pipes.quote(value)
+    return pipes.quote(arg)
 
   def GetCommand(self):
     """Returns the command representing the trace up to this point.
