Title: [273363] branches/safari-611-branch/Tools
- Revision
- 273363
- Author
- [email protected]
- Date
- 2021-02-23 17:05:34 -0800 (Tue, 23 Feb 2021)
Log Message
Cherry-pick r272041. rdar://problem/74668621
[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.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@272041 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-611-branch/Tools/ChangeLog (273362 => 273363)
--- branches/safari-611-branch/Tools/ChangeLog 2021-02-24 01:05:31 UTC (rev 273362)
+++ branches/safari-611-branch/Tools/ChangeLog 2021-02-24 01:05:34 UTC (rev 273363)
@@ -1,5 +1,36 @@
2021-02-23 Ryan Haddad <[email protected]>
+ Cherry-pick r272041. rdar://problem/74668621
+
+ [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.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@272041 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 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-02-23 Ryan Haddad <[email protected]>
+
Cherry-pick r271683. rdar://problem/74668621
[webkitcorepy] Add TaskPool
Modified: branches/safari-611-branch/Tools/Scripts/libraries/webkitcorepy/setup.py (273362 => 273363)
--- branches/safari-611-branch/Tools/Scripts/libraries/webkitcorepy/setup.py 2021-02-24 01:05:31 UTC (rev 273362)
+++ branches/safari-611-branch/Tools/Scripts/libraries/webkitcorepy/setup.py 2021-02-24 01:05:34 UTC (rev 273363)
@@ -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: branches/safari-611-branch/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (273362 => 273363)
--- branches/safari-611-branch/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2021-02-24 01:05:31 UTC (rev 273362)
+++ branches/safari-611-branch/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2021-02-24 01:05:34 UTC (rev 273363)
@@ -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: branches/safari-611-branch/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py (273362 => 273363)
--- branches/safari-611-branch/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py 2021-02-24 01:05:31 UTC (rev 273362)
+++ branches/safari-611-branch/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py 2021-02-24 01:05:34 UTC (rev 273363)
@@ -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
