Changeset 68913 in webkit

Timestamp:

Oct 1, 2010 12:38:00 PM (14 years ago)

Author:

Adam Roben

Message:

Encode Executive command arguments using UTF-8 on Cygwin

Cygwin's Python's os.execv doesn't support unicode command arguments.
Cygwin's execv expects arguments to be encoded using the current code
page. But code pages are limited in what characters they can handle,
and our tests include characters that the English code page can't
handle. So for now we'll just encode everything in UTF-8 on Cygwin,
which can handle all characters but might confuse some commands, for
expediency's sake. I'm sure we'll run into cases where UTF-8 isn't
good enough, but we can deal with that when the problem arises.

Reviewed by Adam Barth.

Fixes <​http://webkit.org/b/46892> <rdar://problem/8496639>
webkitpy.common.system.executive_unittest.ExecutiveTest.test_run_command_with_unicode
fails on Windows

• Scripts/webkitpy/common/system/executive.py:

(Executive._run_command_with_teed_output):
(Executive.run_command):
On Cygwin, encode arguments using UTF-8.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/executive.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-01  Adam Roben  <aroben@apple.com>
+
+        Encode Executive command arguments using UTF-8 on Cygwin
+
+        Cygwin's Python's os.execv doesn't support unicode command arguments.
+        Cygwin's execv expects arguments to be encoded using the current code
+        page. But code pages are limited in what characters they can handle,
+        and our tests include characters that the English code page can't
+        handle.  So for now we'll just encode everything in UTF-8 on Cygwin,
+        which can handle all characters but might confuse some commands, for
+        expediency's sake. I'm sure we'll run into cases where UTF-8 isn't
+        good enough, but we can deal with that when the problem arises.
+
+        Reviewed by Adam Barth.
+
+        Fixes <http://webkit.org/b/46892> <rdar://problem/8496639>
+        webkitpy.common.system.executive_unittest.ExecutiveTest.test_run_command_with_unicode
+        fails on Windows
+
+        * Scripts/webkitpy/common/system/executive.py:
+        (Executive._run_command_with_teed_output):
+        (Executive.run_command):
+        On Cygwin, encode arguments using UTF-8.
+
 2010-10-01  Sam Weinig  <sam@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/common/system/executive.py

@@ -104 +104 @@
     def _run_command_with_teed_output(self, args, teed_output):
         args = map(unicode, args)  # Popen will throw an exception if args are non-strings (like int())
+        if sys.platform == 'cygwin':
+            # Cygwin's Python's os.execv doesn't support unicode command
+            # arguments, and neither does Cygwin's execv itself.
+            # FIXME: Using UTF-8 here will confuse Windows-native commands
+            # which will expect arguments to be encoded using the current code
+            # page.
+            args = [arg.encode('utf-8') for arg in args]
         child_process = subprocess.Popen(args,
                                          stdout=subprocess.PIPE,
@@ -282 +289 @@
         start_time = time.time()
         args = map(unicode, args)  # Popen will throw an exception if args are non-strings (like int())
+        if sys.platform == 'cygwin':
+            # Cygwin's Python's os.execv doesn't support unicode command
+            # arguments, and neither does Cygwin's execv itself.
+            # FIXME: Using UTF-8 here will confuse Windows-native commands
+            # which will expect arguments to be encoded using the current code
+            # page.
+            args = [arg.encode('utf-8') for arg in args]
         stdin, string_to_communicate = self._compute_stdin(input)
         stderr = subprocess.STDOUT if return_stderr else None