Fix handling of spaces with paths in copy_test_data.py

build/copy_test_data_ios.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Copies test data files or directories into a given output directory."""
 
 import optparse
 import os
 import shutil
 import sys
 
 class WrongNumberOfArgumentsException(Exception):
   pass
 
+def EscapePath(path):
+  """Returns a path with spaces escaped."""
+  return path.replace(" ", "\\ ")
+
 def ListFilesForPath(path):
   """Returns a list of all the files under a given path."""
   output = []
   # Ignore revision control metadata directories.
   if (os.path.basename(path).startswith('.git') or
       os.path.basename(path).startswith('.svn')):
     return output
 
   # Files get returned without modification.
   if not os.path.isdir(path):
     output.append(path)
     return output
 
   # Directories get recursively expanded.
   contents = os.listdir(path)
   for item in contents:
     full_path = os.path.join(path, item)
     output.extend(ListFilesForPath(full_path))
   return output
 
 def CalcInputs(inputs):
   """Computes the full list of input files for a set of command-line arguments.
   """
-  # |inputs| is a list of strings, each of which may contain muliple paths
-  # separated by spaces.
+  # |inputs| is a list of paths, which may be directories.
   output = []
   for input in inputs:
-    tokens = input.split()
-    for token in tokens:
-      output.extend(ListFilesForPath(token))
+    output.extend(ListFilesForPath(input))
   return output
 
 def CopyFiles(relative_filenames, output_basedir):
   """Copies files to the given output directory."""
   for file in relative_filenames:
     relative_dirname = os.path.dirname(file)
     output_dir = os.path.join(output_basedir, relative_dirname)
     output_filename = os.path.join(output_basedir, file)
 
     # In cases where a directory has turned into a file or vice versa, delete it
@@ skipping 13 matching lines @@
   parser.set_usage(usage)
   parser.add_option('-o', dest='output_dir')
   parser.add_option('--inputs', action='store_true', dest='list_inputs')
   parser.add_option('--outputs', action='store_true', dest='list_outputs')
   options, arglist = parser.parse_args(argv)
 
   if len(arglist) == 0:
     raise WrongNumberOfArgumentsException('<input_files> required.')
 
   files_to_copy = CalcInputs(arglist)
+  escaped_files = [EscapePath(x) for x in CalcInputs(arglist)]
   if options.list_inputs:
-    return '\n'.join(files_to_copy)
+    return '\n'.join(escaped_files)
 
   if not options.output_dir:
     raise WrongNumberOfArgumentsException('-o required.')
 
   if options.list_outputs:
-    outputs = [os.path.join(options.output_dir, x) for x in files_to_copy]
+    outputs = [os.path.join(options.output_dir, x) for x in escaped_files]
     return '\n'.join(outputs)
 
   CopyFiles(files_to_copy, options.output_dir)
   return
 
 def main(argv):
   try:
     result = DoMain(argv[1:])
   except WrongNumberOfArgumentsException, e:
     print >>sys.stderr, e
     return 1
   if result:
     print result
   return 0
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))