Title: [271692] trunk/Tools
- Revision
- 271692
- Author
- commit-qu...@webkit.org
- Date
- 2021-01-21 08:52:06 -0800 (Thu, 21 Jan 2021)
Log Message
[webkitcorepy] Don't import six at the top level
https://bugs.webkit.org/show_bug.cgi?id=220795
Patch by Angelos Oikonomopoulos <ange...@igalia.com> on 2021-01-21
Reviewed by Aakash Jain.
Instead, do the import after the module has been loaded, when
AutoInstall has been set up properly. Fixes a regression after
1d342a5067e22ac8069ff3ff337b2d58e1d06517, where task_pool.py uses
the six module without it being installed.
* Scripts/libraries/webkitcorepy/webkitcorepy/task_pool.py:
(ChildException.__call__):
(TaskPool.__exit__):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (271691 => 271692)
--- trunk/Tools/ChangeLog 2021-01-21 15:47:16 UTC (rev 271691)
+++ trunk/Tools/ChangeLog 2021-01-21 16:52:06 UTC (rev 271692)
@@ -1,3 +1,19 @@
+2021-01-21 Angelos Oikonomopoulos <ange...@igalia.com>
+
+ [webkitcorepy] Don't import six at the top level
+ https://bugs.webkit.org/show_bug.cgi?id=220795
+
+ Reviewed by Aakash Jain.
+
+ Instead, do the import after the module has been loaded, when
+ AutoInstall has been set up properly. Fixes a regression after
+ 1d342a5067e22ac8069ff3ff337b2d58e1d06517, where task_pool.py uses
+ the six module without it being installed.
+
+ * Scripts/libraries/webkitcorepy/webkitcorepy/task_pool.py:
+ (ChildException.__call__):
+ (TaskPool.__exit__):
+
2021-01-21 Aditya Keerthi <akeer...@apple.com>
[macOS] Titlebar separator doesn't show when WKWebView is scrolled
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/task_pool.py (271691 => 271692)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/task_pool.py 2021-01-21 15:47:16 UTC (rev 271691)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/task_pool.py 2021-01-21 16:52:06 UTC (rev 271692)
@@ -27,7 +27,6 @@
import signal
import sys
-from six import reraise
from webkitcorepy import OutputCapture, Timeout, log
@@ -120,6 +119,7 @@
self.exc_info = exc_info or sys.exc_info()
def __call__(self, caller):
+ from six import reraise
_, exception, trace = sys.exc_info()
if exception:
log.critical("Exception in flight, '{}' ignored".format(self.exc_info[1]))
@@ -335,6 +335,7 @@
self.queue.receive()(self)
def __exit__(self, *args, **kwargs):
+ from six import reraise
try:
inflight = sys.exc_info()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
