Changeset 294356 in webkit

Timestamp:

May 17, 2022, 4:17:39 PM (4 years ago)

Author:

Adrian Perez de Castro

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.

Location:

releases/WebKitGTK/webkit-2.36/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/check-for-global-bss-symbols-in-webkitgtk-libs (modified) (2 diffs)
• gtk/jhbuildrc (modified) (1 diff)
• gtk/ycm_extra_conf.py (modified) (1 diff)
• jhbuild/jhbuild-wrapper (modified) (2 diffs)
• jhbuild/jhbuildrc_common.py (modified) (1 diff)
• wpe/jhbuildrc (modified) (1 diff)

releases/WebKitGTK/webkit-2.36/Tools/ChangeLog

@@ +1 @@
+2022-03-03  Lauro Moura  <lmoura@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  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.36/Tools/Scripts/check-for-global-bss-symbols-in-webkitgtk-libs

@@ -1 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import re
@@ -11 +11 @@
     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

releases/WebKitGTK/webkit-2.36/Tools/gtk/jhbuildrc

@@ -1 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (C) 2011-2014 Igalia S.L.
 #

releases/WebKitGTK/webkit-2.36/Tools/gtk/ycm_extra_conf.py

@@ -1 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (C) 2013 Danilo Cesar Lemes de Paula <danilo.eu@gmail.com>
 # Copyright (C) 2014 ChangSeok Oh <shivamidow@gmail.com>

releases/WebKitGTK/webkit-2.36/Tools/jhbuild/jhbuild-wrapper

@@ -1 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (C) 2011 Igalia S.L.
 # Copyright (C) 2012 Gustavo Noronha Silva <gns@gnome.org>
@@ -60 +60 @@
         raise Exception('failed to find jhbuild revision: %s' % err)
 
-    return output.strip() == jhbuild_revision
+    return output.strip().decode('utf-8', 'ignore') == jhbuild_revision
 
 

releases/WebKitGTK/webkit-2.36/Tools/jhbuild/jhbuildrc_common.py

@@ -1 @@
-#!/usr/bin/env python
 # Copyright (C) 2011 Igalia S.L.
 # Copyright (C) 2012 Intel Corporation

releases/WebKitGTK/webkit-2.36/Tools/wpe/jhbuildrc

@@ -1 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (C) 2014 Igalia S.L.
 #