Changeset 267529 in webkit

Timestamp:

Sep 24, 2020, 7:17:22 AM (6 years ago)

Author:

svillar@igalia.com

Message:

[JHBUILD] Port jhbuild-wrapper to python3
​https://bugs.webkit.org/show_bug.cgi?id=216916

Reviewed by Adrian Perez de Castro.

Python2 is at its EOL, distributions are starting to remove it and python3 should be used by default now. Migrated
jhbuild wrapper code to python3 (while keeping backwards compatibility with python2 just in case).

• jhbuild/jhbuild-wrapper:

(ensure_jhbuild): Replace has_key() by the more pythonic construction with 'in'.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• jhbuild/jhbuild-wrapper (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-09-24  Sergio Villar Senin  <svillar@igalia.com>
+
+        [JHBUILD] Port jhbuild-wrapper to python3
+        https://bugs.webkit.org/show_bug.cgi?id=216916
+
+        Reviewed by Adrian Perez de Castro.
+
+        Python2 is at its EOL, distributions are starting to remove it and python3 should be used by default now. Migrated
+        jhbuild wrapper code to python3 (while keeping backwards compatibility with python2 just in case).
+
+        * jhbuild/jhbuild-wrapper:
+        (ensure_jhbuild): Replace has_key() by the more pythonic construction with 'in'.
+
 2020-09-24  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/jhbuild/jhbuild-wrapper

@@ -1 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # Copyright (C) 2011 Igalia S.L.
 # Copyright (C) 2012 Gustavo Noronha Silva <gns@gnome.org>
@@ -118 +118 @@
 # Work-around the fact that we may get called from inside the jhbuild environment
 # which will cause problems if we just cleaned the jhbuild install root
-if os.environ.has_key('UNDER_JHBUILD') and os.environ.has_key('ACLOCAL_FLAGS'):
+if 'UNDER_JHBUILD' in os.environ and 'ACLOCAL_FLAGS' in os.environ:
     del os.environ['ACLOCAL_FLAGS']