gclient: Make smoketests run on Windows.
Bug: 1024683
Change-Id: I1c30473699c1bd6b198188b53b632e3617fed335
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1929653
Reviewed-by: Anthony Polito <apolito@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
diff --git a/gclient.py b/gclient.py
index bf7b1ff..128d334 100755
--- a/gclient.py
+++ b/gclient.py
@@ -1042,8 +1042,8 @@
if isinstance(value, basestring):
value = gclient_eval.EvaluateCondition(value, variables)
lines.append('%s = %s' % (arg, ToGNString(value)))
- with open(os.path.join(self.root.root_dir, self._gn_args_file), 'w') as f:
- f.write('\n'.join(lines))
+ with open(os.path.join(self.root.root_dir, self._gn_args_file), 'wb') as f:
+ f.write('\n'.join(lines).encode('utf-8', 'replace'))
@gclient_utils.lockedmethod
def _run_is_done(self, file_list):
@@ -1322,10 +1322,10 @@
DEFAULT_CLIENT_FILE_TEXT = ("""\
solutions = [
- { "name" : "%(solution_name)s",
- "url" : "%(solution_url)s",
- "deps_file" : "%(deps_file)s",
- "managed" : %(managed)s,
+ { "name" : %(solution_name)r,
+ "url" : %(solution_url)r,
+ "deps_file" : %(deps_file)r,
+ "managed" : %(managed)r,
"custom_deps" : {
},
"custom_vars": %(custom_vars)r,