Title: [282294] trunk/Tools
- Revision
- 282294
- Author
- jbed...@apple.com
- Date
- 2021-09-10 15:16:06 -0700 (Fri, 10 Sep 2021)
Log Message
[webkitcorepy] AutoInstall occasionally raising SSL error
https://bugs.webkit.org/show_bug.cgi?id=230169
<rdar://problem/82767008>
Reviewed by Dewei Zhu.
* Scripts/libraries/webkitcorepy/setup.py: Bump version.
* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
* Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
(AutoInstall._request): Pass cafile into urlopen directly.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (282293 => 282294)
--- trunk/Tools/ChangeLog 2021-09-10 21:05:21 UTC (rev 282293)
+++ trunk/Tools/ChangeLog 2021-09-10 22:16:06 UTC (rev 282294)
@@ -1,3 +1,16 @@
+2021-09-10 Jonathan Bedard <jbed...@apple.com>
+
+ [webkitcorepy] AutoInstall occasionally raising SSL error
+ https://bugs.webkit.org/show_bug.cgi?id=230169
+ <rdar://problem/82767008>
+
+ Reviewed by Dewei Zhu.
+
+ * Scripts/libraries/webkitcorepy/setup.py: Bump version.
+ * Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
+ * Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
+ (AutoInstall._request): Pass cafile into urlopen directly.
+
2021-09-10 Aakash Jain <aakash_j...@apple.com>
[build.webkit.org] Remove ./ from command invocations
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/setup.py (282293 => 282294)
--- trunk/Tools/Scripts/libraries/webkitcorepy/setup.py 2021-09-10 21:05:21 UTC (rev 282293)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/setup.py 2021-09-10 22:16:06 UTC (rev 282294)
@@ -30,7 +30,7 @@
setup(
name='webkitcorepy',
- version='0.10.1',
+ version='0.10.2',
description='Library containing various Python support classes and functions.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (282293 => 282294)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2021-09-10 21:05:21 UTC (rev 282293)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2021-09-10 22:16:06 UTC (rev 282294)
@@ -42,7 +42,7 @@
from webkitcorepy.call_by_need import CallByNeed
from webkitcorepy.editor import Editor
-version = Version(0, 10, 1)
+version = Version(0, 10, 2)
from webkitcorepy.autoinstall import Package, AutoInstall
if sys.version_info > (3, 0):
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py (282293 => 282294)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py 2021-09-10 21:05:21 UTC (rev 282293)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py 2021-09-10 22:16:06 UTC (rev 282294)
@@ -26,7 +26,6 @@
import os
import platform
import re
-import ssl
import subprocess
import shutil
import sys
@@ -409,10 +408,7 @@
@classmethod
def _request(cls, url, ca_cert_path=None):
- context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
- if ca_cert_path or cls.ca_cert_path:
- context.load_verify_locations(cafile=ca_cert_path or cls.ca_cert_path)
- return urlopen(url, timeout=cls.timeout, context=context)
+ return urlopen(url, timeout=cls.timeout, cafile=ca_cert_path or cls.ca_cert_path)
@classmethod
def enabled(cls):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
