Don't put unicode strings into the environment

gclient.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.
 
 """Meta checkout manager supporting both Subversion and GIT."""
 # Files
 #   .gclient      : Current client configuration, written by 'config' command.
 #                   Format is a Python script defining 'solutions', a list whose
 #                   entries each are maps binding the strings "name" and "url"
@@ skipping 685 matching lines @@
       # Parse the dependencies of this dependency.
       for s in self.dependencies:
         work_queue.enqueue(s)
 
     if command == 'recurse':
       if not isinstance(parsed_url, self.FileImpl):
         # Skip file only checkout.
         scm = gclient_scm.GetScmName(parsed_url)
         if not options.scm or scm in options.scm:
           cwd = os.path.normpath(os.path.join(self.root.root_dir, self.name))
-          # Pass in the SCM type as an env variable
+          # Pass in the SCM type as an env variable.  Make sure we don't put
+          # unicode strings in the environment.
           env = os.environ.copy()
           if scm:
-            env['GCLIENT_SCM'] = scm
+            env['GCLIENT_SCM'] = str(scm)
           if parsed_url:
-            env['GCLIENT_URL'] = parsed_url
-          env['GCLIENT_DEP_PATH'] = self.name
+            env['GCLIENT_URL'] = str(parsed_url)
+          env['GCLIENT_DEP_PATH'] = str(self.name)
           if options.prepend_dir and scm == 'git':
             print_stdout = False
             def filter_fn(line):
               """Git-specific path marshaling. It is optimized for git-grep."""
 
               def mod_path(git_pathspec):
                 match = re.match('^(\\S+?:)?([^\0]+)$', git_pathspec)
                 modified_path = os.path.join(self.name, match.group(2))
                 branch = match.group(1) or ''
                 return '%s%s' % (branch, modified_path)
@@ skipping 1196 matching lines @@
     raise
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: