Let gn_helpers.py handle unicode as str

build/gn_helpers.py

 # Copyright 2014 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.
 
 """Helper functions useful when writing scripts that integrate with GN.
 
 The main functions are ToGNString and FromGNString which convert between
 serialized GN veriables and Python variables.
 
 To use in a random python file in the build:
@@ skipping 18 matching lines @@
   allow_dicts indicates if this function will allow converting dictionaries
   to GN scopes. This is only possible at the top level, you can't nest a
   GN scope in a list, so this should be set to False for recursive calls."""
   if isinstance(value, str):
     if value.find('\n') >= 0:
       raise GNException("Trying to print a string with a newline in it.")
     return '"' + \
         value.replace('\\', '\\\\').replace('"', '\\"').replace('$', '\\$') + \
         '"'
 
+  if isinstance(value, unicode):
+    return ToGNString(value.encode('utf-8'))
+
   if isinstance(value, bool):
     if value:
       return "true"
     return "false"
 
   if isinstance(value, list):
     return '[ %s ]' % ', '.join(ToGNString(v) for v in value)
 
   if isinstance(value, dict):
     if not allow_dicts:
@@ skipping 230 matching lines @@
     location in the input. If it does, the text is consumed and the function
     returns true. Otherwise, returns false and the current position is
     unchanged."""
     end = self.cur + len(constant)
     if end > len(self.input):
       return False  # Not enough room.
     if self.input[self.cur:end] == constant:
       self.cur = end
       return True
     return False