Title: [195203] releases/WebKitGTK/webkit-2.10/Source/WebInspectorUI
- Revision
- 195203
- Author
- [email protected]
- Date
- 2016-01-18 04:08:07 -0800 (Mon, 18 Jan 2016)
Log Message
Merge r194498 - [GTK] webkit 2.3.5 build failure with python 3.3.4
https://bugs.webkit.org/show_bug.cgi?id=128971
Reviewed by Michael Catanzaro.
Make sure that the stdin encoding is 'UTF-8' if using Python 3,
otherwise the build will break.
* Scripts/cssmin.py:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/Source/WebInspectorUI/ChangeLog (195202 => 195203)
--- releases/WebKitGTK/webkit-2.10/Source/WebInspectorUI/ChangeLog 2016-01-18 12:05:46 UTC (rev 195202)
+++ releases/WebKitGTK/webkit-2.10/Source/WebInspectorUI/ChangeLog 2016-01-18 12:08:07 UTC (rev 195203)
@@ -1,3 +1,15 @@
+2016-01-02 Alberto Garcia <[email protected]>
+
+ [GTK] webkit 2.3.5 build failure with python 3.3.4
+ https://bugs.webkit.org/show_bug.cgi?id=128971
+
+ Reviewed by Michael Catanzaro.
+
+ Make sure that the stdin encoding is 'UTF-8' if using Python 3,
+ otherwise the build will break.
+
+ * Scripts/cssmin.py:
+
2015-10-01 Andres Gomez <[email protected]>
[GTK] Web Inspector: Add GTK+ icons for the numerical input and slider based Visual editors for CSS properties
Modified: releases/WebKitGTK/webkit-2.10/Source/WebInspectorUI/Scripts/cssmin.py (195202 => 195203)
--- releases/WebKitGTK/webkit-2.10/Source/WebInspectorUI/Scripts/cssmin.py 2016-01-18 12:05:46 UTC (rev 195202)
+++ releases/WebKitGTK/webkit-2.10/Source/WebInspectorUI/Scripts/cssmin.py 2016-01-18 12:08:07 UTC (rev 195203)
@@ -43,4 +43,7 @@
if __name__ == "__main__":
import sys
+ if sys.version_info[0] == 3 and sys.stdin.encoding != 'UTF-8':
+ import io
+ sys.stdin = io.TextIOWrapper(sys.stdin.buffer, encoding='UTF-8')
sys.stdout.write(cssminify(sys.stdin.read()))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
