Fix subprocess2.Popen() logging when given a string

subprocess2.py

 # coding=utf8
 # Copyright (c) 2011 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.
 """Collection of subprocess wrapper functions.
 
 In theory you shouldn't need anything else in subprocess, or this module failed.
 """
 
 from __future__ import with_statement
@@ skipping 140 matching lines @@
 
   env = get_english_env(kwargs.get('env'))
   if env:
     kwargs['env'] = env
   if kwargs.get('shell') is None:
     # *Sigh*:  Windows needs shell=True, or else it won't search %PATH% for the
     # executable, but shell=True makes subprocess on Linux fail when it's called
     # with a list because it only tries to execute the first item in the list.
     kwargs['shell'] = bool(sys.platform=='win32')
 
-  tmp_str = ' '.join(args)
+  if isinstance(args, basestring):
+    tmp_str = args
+  elif isinstance(args, (list, tuple)):
+    tmp_str = ' '.join(args)
+  else:
+    raise CalledProcessError(None, args, kwargs.get('cwd'), None, None)
   if kwargs.get('cwd', None):
     tmp_str += ';  cwd=%s' % kwargs['cwd']
   logging.debug(tmp_str)
 
   def fix(stream):
     if kwargs.get(stream) in (VOID, os.devnull):
       # Replaces VOID with handle to /dev/null.
       # Create a temporary file to workaround python's deadlock.
       # http://docs.python.org/library/subprocess.html#subprocess.Popen.wait
       # When the pipe fills up, it will deadlock this process. Using a real file
@@ skipping 124 matching lines @@
 
   Captures stdout of a process call and returns stdout only.
 
   - Throws if return code is not 0.
   - Works even prior to python 2.7.
   - Blocks stdin by default if not specified since no output will be visible.
   - As per doc, "The stdout argument is not allowed as it is used internally."
   """
   kwargs.setdefault('stdin', VOID)
   return check_call_out(args, stdout=PIPE, **kwargs)[0]