Title: [294356] releases/WebKitGTK/webkit-2.36/Tools
- Revision
- 294356
- Author
- ape...@igalia.com
- Date
- 2022-05-17 16:17:39 -0700 (Tue, 17 May 2022)
Log Message
Merge r290799 - [Python3] Switch a few more glib scripts to Python3
https://bugs.webkit.org/show_bug.cgi?id=237442
Reviewed by Adrian Perez de Castro.
* Scripts/check-for-global-bss-symbols-in-webkitgtk-libs: Update
shebang.
(bss_symbols): Decode Popen bytes output.
* gtk/jhbuildrc: Update shebang.
* gtk/ycm_extra_conf.py: Ditto.
* jhbuild/jhbuild-wrapper: Ditto.
(jhbuild_at_expected_revision): Decode Popen bytes output.
* jhbuild/jhbuildrc_common.py: Remove uneeded shebang.
* wpe/jhbuildrc: Update shebang.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.36/Tools/ChangeLog (294355 => 294356)
--- releases/WebKitGTK/webkit-2.36/Tools/ChangeLog 2022-05-17 22:41:45 UTC (rev 294355)
+++ releases/WebKitGTK/webkit-2.36/Tools/ChangeLog 2022-05-17 23:17:39 UTC (rev 294356)
@@ -1,3 +1,20 @@
+2022-03-03 Lauro Moura <lmo...@igalia.com>
+
+ [Python3] Switch a few more glib scripts to Python3
+ https://bugs.webkit.org/show_bug.cgi?id=237442
+
+ Reviewed by Adrian Perez de Castro.
+
+ * Scripts/check-for-global-bss-symbols-in-webkitgtk-libs: Update
+ shebang.
+ (bss_symbols): Decode Popen bytes output.
+ * gtk/jhbuildrc: Update shebang.
+ * gtk/ycm_extra_conf.py: Ditto.
+ * jhbuild/jhbuild-wrapper: Ditto.
+ (jhbuild_at_expected_revision): Decode Popen bytes output.
+ * jhbuild/jhbuildrc_common.py: Remove uneeded shebang.
+ * wpe/jhbuildrc: Update shebang.
+
2022-04-21 Carlos Garcia Campos <cgar...@igalia.com>
[GTK][WPE] Make make-dist script python3 only
Modified: releases/WebKitGTK/webkit-2.36/Tools/Scripts/check-for-global-bss-symbols-in-webkitgtk-libs (294355 => 294356)
--- releases/WebKitGTK/webkit-2.36/Tools/Scripts/check-for-global-bss-symbols-in-webkitgtk-libs 2022-05-17 22:41:45 UTC (rev 294355)
+++ releases/WebKitGTK/webkit-2.36/Tools/Scripts/check-for-global-bss-symbols-in-webkitgtk-libs 2022-05-17 23:17:39 UTC (rev 294356)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import re
import subprocess
@@ -10,7 +10,7 @@
data = ""
pattern = re.compile('^[0-9a-f]+ ([a-zA-Z ])[a-zA-Z ][a-zA-Z ][a-zA-Z ][a-zA-Z ][a-zA-Z ][a-zA-Z ] \.bss\t[0-9a-f]+ +(.*)$')
for line in data.splitlines():
- m = pattern.match(line)
+ m = pattern.match(line.decode('utf-8', 'ignore'))
if not m:
continue
if sfilter is None or sfilter(m.group(1)):
Modified: releases/WebKitGTK/webkit-2.36/Tools/gtk/jhbuildrc (294355 => 294356)
--- releases/WebKitGTK/webkit-2.36/Tools/gtk/jhbuildrc 2022-05-17 22:41:45 UTC (rev 294355)
+++ releases/WebKitGTK/webkit-2.36/Tools/gtk/jhbuildrc 2022-05-17 23:17:39 UTC (rev 294356)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2011-2014 Igalia S.L.
#
# This library is free software; you can redistribute it and/or
Modified: releases/WebKitGTK/webkit-2.36/Tools/gtk/ycm_extra_conf.py (294355 => 294356)
--- releases/WebKitGTK/webkit-2.36/Tools/gtk/ycm_extra_conf.py 2022-05-17 22:41:45 UTC (rev 294355)
+++ releases/WebKitGTK/webkit-2.36/Tools/gtk/ycm_extra_conf.py 2022-05-17 23:17:39 UTC (rev 294356)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2013 Danilo Cesar Lemes de Paula <danilo...@gmail.com>
# Copyright (C) 2014 ChangSeok Oh <shivami...@gmail.com>
#
Modified: releases/WebKitGTK/webkit-2.36/Tools/jhbuild/jhbuild-wrapper (294355 => 294356)
--- releases/WebKitGTK/webkit-2.36/Tools/jhbuild/jhbuild-wrapper 2022-05-17 22:41:45 UTC (rev 294355)
+++ releases/WebKitGTK/webkit-2.36/Tools/jhbuild/jhbuild-wrapper 2022-05-17 23:17:39 UTC (rev 294356)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2011 Igalia S.L.
# Copyright (C) 2012 Gustavo Noronha Silva <g...@gnome.org>
# Copyright (C) 2012 Intel Corporation
@@ -59,7 +59,7 @@
if process.returncode != 0:
raise Exception('failed to find jhbuild revision: %s' % err)
- return output.strip() == jhbuild_revision
+ return output.strip().decode('utf-8', 'ignore') == jhbuild_revision
def update_jhbuild():
Modified: releases/WebKitGTK/webkit-2.36/Tools/jhbuild/jhbuildrc_common.py (294355 => 294356)
--- releases/WebKitGTK/webkit-2.36/Tools/jhbuild/jhbuildrc_common.py 2022-05-17 22:41:45 UTC (rev 294355)
+++ releases/WebKitGTK/webkit-2.36/Tools/jhbuild/jhbuildrc_common.py 2022-05-17 23:17:39 UTC (rev 294356)
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# Copyright (C) 2011 Igalia S.L.
# Copyright (C) 2012 Intel Corporation
#
Modified: releases/WebKitGTK/webkit-2.36/Tools/wpe/jhbuildrc (294355 => 294356)
--- releases/WebKitGTK/webkit-2.36/Tools/wpe/jhbuildrc 2022-05-17 22:41:45 UTC (rev 294355)
+++ releases/WebKitGTK/webkit-2.36/Tools/wpe/jhbuildrc 2022-05-17 23:17:39 UTC (rev 294356)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2014 Igalia S.L.
#
# This library is free software; you can redistribute it and/or
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
