Title: [197555] releases/WebKitGTK/webkit-2.4/Tools
Revision
197555
Author
[email protected]
Date
2016-03-04 04:51:49 -0800 (Fri, 04 Mar 2016)

Log Message

Merge r164794 - [gtk-doc] UnicodeEncodeError: 'ascii' codec can't encode character
https://bugs.webkit.org/show_bug.cgi?id=128927

Reviewed by Philippe Normand.

Encode manually the data for sys.{stdout,stderr}.write.

* gtk/gtkdoc.py:
(GTKDoc._run_command):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.4/Tools/ChangeLog (197554 => 197555)


--- releases/WebKitGTK/webkit-2.4/Tools/ChangeLog	2016-03-04 09:52:39 UTC (rev 197554)
+++ releases/WebKitGTK/webkit-2.4/Tools/ChangeLog	2016-03-04 12:51:49 UTC (rev 197555)
@@ -1,3 +1,15 @@
+2014-02-27  Alberto Garcia  <[email protected]>
+
+        [gtk-doc] UnicodeEncodeError: 'ascii' codec can't encode character
+        https://bugs.webkit.org/show_bug.cgi?id=128927
+
+        Reviewed by Philippe Normand.
+
+        Encode manually the data for sys.{stdout,stderr}.write.
+
+        * gtk/gtkdoc.py:
+        (GTKDoc._run_command):
+
 2015-04-17  Milan Crha  <[email protected]>
 
         [GTK] Expand wildcards inside generate-inspector-gresource-manifest.py

Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/gtkdoc.py (197554 => 197555)


--- releases/WebKitGTK/webkit-2.4/Tools/gtk/gtkdoc.py	2016-03-04 09:52:39 UTC (rev 197554)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/gtkdoc.py	2016-03-04 12:51:49 UTC (rev 197555)
@@ -195,9 +195,9 @@
 
         if print_output:
             if stdout:
-                sys.stdout.write(stdout)
+                sys.stdout.write(stdout.encode("utf-8"))
             if stderr:
-                sys.stderr.write(stderr)
+                sys.stderr.write(stderr.encode("utf-8"))
 
         if process.returncode != 0:
             raise Exception('%s produced a non-zero return code %i'
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to