Merge pull request #58420 from etcwilde/ewilde/fix-python3-encoding

etcwilde · web-flow · commit f0ba04e40efc · 2022-04-29T10:33:41.000-07:00
`line-directive` decode utf8 charset
diff --git a/utils/line-directive b/utils/line-directive
@@ -690,7 +690,8 @@ def run():
             command_args,
             stderr=subprocess.STDOUT,
             stdout=subprocess.PIPE,
-            universal_newlines=True
+            universal_newlines=True,
+            encoding='UTF-8'
         )
 
         sources = '(?P<file>' + '|'.join(re.escape(s) for s in sources) + ')'
diff --git a/validation-test/Python/line-directive.swift b/validation-test/Python/line-directive.swift
@@ -1 +1,2 @@
 // RUN: %{python} %utils/line-directive
+// RUN: %{python} %utils/line-directive -- %{python} -c "print('Hello 😄🂐')"

Original file line number	Diff line number	Diff line change
`@@ -690,7 +690,8 @@ def run():`
`690`	`690`	`command_args,`
`691`	`691`	`stderr=subprocess.STDOUT,`
`692`	`692`	`stdout=subprocess.PIPE,`
`693`		`- universal_newlines=True`
	`693`	`+ universal_newlines=True,`
	`694`	`+ encoding='UTF-8'`
`694`	`695`	`)`
`695`	`696`
`696`	`697`	`sources = '(?P<file>' + '\|'.join(re.escape(s) for s in sources) + ')'`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`// RUN: %{python} %utils/line-directive`
	`2`	`+// RUN: %{python} %utils/line-directive -- %{python} -c "print('Hello 😄🂐')"`