Title: [272041] trunk/Tools
- Revision
- 272041
- Author
- [email protected]
- Date
- 2021-01-28 17:50:29 -0800 (Thu, 28 Jan 2021)
Log Message
[webkitcrepy] Handle case where pypi serves invalid html
https://bugs.webkit.org/show_bug.cgi?id=221111
<rdar://problem/73728580>
Reviewed by David Kilzer.
* Scripts/libraries/webkitcorepy/setup.py: Bump version number.
* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
* Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
(Package.archives): Remove possibly invalid <meta> tag from html.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (272040 => 272041)
--- trunk/Tools/ChangeLog 2021-01-29 00:39:53 UTC (rev 272040)
+++ trunk/Tools/ChangeLog 2021-01-29 01:50:29 UTC (rev 272041)
@@ -1,3 +1,16 @@
+2021-01-28 Jonathan Bedard <[email protected]>
+
+ [webkitcrepy] Handle case where pypi serves invalid html
+ https://bugs.webkit.org/show_bug.cgi?id=221111
+ <rdar://problem/73728580>
+
+ Reviewed by David Kilzer.
+
+ * Scripts/libraries/webkitcorepy/setup.py: Bump version number.
+ * Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
+ * Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
+ (Package.archives): Remove possibly invalid <meta> tag from html.
+
2021-01-28 Aakash Jain <[email protected]>
[build.webkit.org] Remove dead code for TestWebKit1LeaksFactory
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/setup.py (272040 => 272041)
--- trunk/Tools/Scripts/libraries/webkitcorepy/setup.py 2021-01-29 00:39:53 UTC (rev 272040)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/setup.py 2021-01-29 01:50:29 UTC (rev 272041)
@@ -30,7 +30,7 @@
setup(
name='webkitcorepy',
- version='0.5.0',
+ version='0.5.1',
description='Library containing various Python support classes and functions.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (272040 => 272041)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2021-01-29 00:39:53 UTC (rev 272040)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2021-01-29 01:50:29 UTC (rev 272041)
@@ -36,7 +36,7 @@
from webkitcorepy.output_capture import LoggerCapture, OutputCapture, OutputDuplicate
from webkitcorepy.task_pool import TaskPool
-version = Version(0, 5, 0)
+version = Version(0, 5, 1)
from webkitcorepy.autoinstall import Package, AutoInstall
if sys.version_info > (3, 0):
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py (272040 => 272041)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py 2021-01-29 00:39:53 UTC (rev 272040)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py 2021-01-29 01:50:29 UTC (rev 272041)
@@ -126,7 +126,11 @@
if response.code != 200:
raise ValueError('The package {} was not found on {}'.format(self.pypi_name, AutoInstall.index))
- page = minidom.parseString(response.read())
+ # In some cases, pypi serves invalid html
+ content = response.read()
+ content = re.sub(b'\s+<meta [^\n]+>\n', b'', content)
+
+ page = minidom.parseString(content)
cached_tags = None
for element in reversed(page.getElementsByTagName("a")):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
