Title: [267529] trunk/Tools
- Revision
- 267529
- Author
- [email protected]
- Date
- 2020-09-24 07:17:22 -0700 (Thu, 24 Sep 2020)
Log 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'.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (267528 => 267529)
--- trunk/Tools/ChangeLog 2020-09-24 13:21:13 UTC (rev 267528)
+++ trunk/Tools/ChangeLog 2020-09-24 14:17:22 UTC (rev 267529)
@@ -1,3 +1,16 @@
+2020-09-24 Sergio Villar Senin <[email protected]>
+
+ [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 <[email protected]>
REGRESSION(r267502): [GTK][WPE] ephemeral WebKitWebsiteDataManager ignores TLS errors by default
Modified: trunk/Tools/jhbuild/jhbuild-wrapper (267528 => 267529)
--- trunk/Tools/jhbuild/jhbuild-wrapper 2020-09-24 13:21:13 UTC (rev 267528)
+++ trunk/Tools/jhbuild/jhbuild-wrapper 2020-09-24 14:17:22 UTC (rev 267529)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
# Copyright (C) 2011 Igalia S.L.
# Copyright (C) 2012 Gustavo Noronha Silva <[email protected]>
# Copyright (C) 2012 Intel Corporation
@@ -117,7 +117,7 @@
# 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']
ensure_jhbuild(platform)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
