Diff
Modified: trunk/Tools/ChangeLog (268548 => 268549)
--- trunk/Tools/ChangeLog 2020-10-15 19:55:00 UTC (rev 268548)
+++ trunk/Tools/ChangeLog 2020-10-15 20:24:15 UTC (rev 268549)
@@ -1,3 +1,25 @@
+2020-10-15 Jonathan Bedard <[email protected]>
+
+ [webkitpy] Use webkitcorepy's autoinstaller for mechanize
+ https://bugs.webkit.org/show_bug.cgi?id=217683
+ <rdar://problem/70272262>
+
+ Reviewed by Aakash Jain.
+
+ * Scripts/webkitpy/__init__.py: Add mechanize.
+ * Scripts/webkitpy/common/net/bugzilla/bugzilla.py:
+ (Bugzilla._get_browser):
+ * Scripts/webkitpy/common/net/buildbot/buildbot.py:
+ * Scripts/webkitpy/common/net/ewsserver.py:
+ (EWSServer.__init__):
+ * Scripts/webkitpy/common/net/networktransaction_unittest.py:
+ (NetworkTransactionTest._raise_500_error):
+ (NetworkTransactionTest._raise_URLError):
+ (NetworkTransactionTest._raise_404_error):
+ * Scripts/webkitpy/thirdparty/__init__.py:
+ (AutoinstallImportHook.find_module): Remov _install_mechanize().
+ (AutoinstallImportHook._install_mechanize): Deleted.
+
2020-10-15 Lauro Moura <[email protected]>
[Flatpak SDK] Check for installed packages in setup_buildir
Modified: trunk/Tools/Scripts/webkitpy/__init__.py (268548 => 268549)
--- trunk/Tools/Scripts/webkitpy/__init__.py 2020-10-15 19:55:00 UTC (rev 268548)
+++ trunk/Tools/Scripts/webkitpy/__init__.py 2020-10-15 20:24:15 UTC (rev 268549)
@@ -40,6 +40,7 @@
AutoInstall.register(Package('more_itertools', Version(5, 0, 0), pypi_name='more-itertools'))
AutoInstall.register(Package('genshi', Version(0, 7, 3), pypi_name='Genshi'))
AutoInstall.register(Package('html5lib', Version(1, 1)))
+AutoInstall.register(Package('mechanize', Version(0, 4, 5)))
AutoInstall.register(Package('mozprocess', Version(1, 2, 0)))
AutoInstall.register(Package('mozlog', Version(6, 1)))
AutoInstall.register(Package('mozterm', Version(1, 0, 0)))
Modified: trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py (268548 => 268549)
--- trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py 2020-10-15 19:55:00 UTC (rev 268548)
+++ trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py 2020-10-15 20:24:15 UTC (rev 268549)
@@ -317,7 +317,7 @@
def _get_browser(self):
if not self._browser:
self.setdefaulttimeout(600)
- from webkitpy.thirdparty.autoinstalled.mechanize import Browser
+ from mechanize import Browser
self._browser = Browser()
self._browser.set_handle_robots(False)
return self._browser
Modified: trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py (268548 => 268549)
--- trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py 2020-10-15 19:55:00 UTC (rev 268548)
+++ trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py 2020-10-15 20:24:15 UTC (rev 268549)
@@ -40,9 +40,10 @@
from webkitpy.common.net.networktransaction import NetworkTransaction
from webkitpy.common.net.regressionwindow import RegressionWindow
from webkitpy.common.system.logutils import get_logger
-from webkitpy.thirdparty.autoinstalled.mechanize import Browser
from webkitpy.thirdparty.BeautifulSoup import BeautifulSoup
+from mechanize import Browser
+
if sys.version_info > (3, 0):
from urllib.error import HTTPError, URLError
from urllib.parse import quote
Modified: trunk/Tools/Scripts/webkitpy/common/net/ewsserver.py (268548 => 268549)
--- trunk/Tools/Scripts/webkitpy/common/net/ewsserver.py 2020-10-15 19:55:00 UTC (rev 268548)
+++ trunk/Tools/Scripts/webkitpy/common/net/ewsserver.py 2020-10-15 20:24:15 UTC (rev 268549)
@@ -34,7 +34,7 @@
def __init__(self, host=ewsserver_default_host, use_https=True, browser=None):
self.host = host
self.use_https = bool(use_https)
- from webkitpy.thirdparty.autoinstalled.mechanize import Browser
+ from mechanize import Browser
self._browser = browser or Browser()
self._browser.set_handle_robots(False)
Modified: trunk/Tools/Scripts/webkitpy/common/net/networktransaction_unittest.py (268548 => 268549)
--- trunk/Tools/Scripts/webkitpy/common/net/networktransaction_unittest.py 2020-10-15 19:55:00 UTC (rev 268548)
+++ trunk/Tools/Scripts/webkitpy/common/net/networktransaction_unittest.py 2020-10-15 20:24:15 UTC (rev 268549)
@@ -58,7 +58,7 @@
def _raise_500_error(self):
self._run_count += 1
if self._run_count < 3:
- from webkitpy.thirdparty.autoinstalled.mechanize import HTTPError
+ from mechanize import HTTPError
raise HTTPError("http://example.com/", 500, "internal server error", None, None)
return 42
@@ -65,12 +65,12 @@
def _raise_URLError(self):
self._run_count += 1
if self._run_count < 3:
- from webkitpy.thirdparty.autoinstalled.mechanize import URLError
+ from mechanize import URLError
raise URLError("[Errno 60] Operation timed out")
return 43
def _raise_404_error(self):
- from webkitpy.thirdparty.autoinstalled.mechanize import HTTPError
+ from mechanize import HTTPError
raise HTTPError("http://foo.com/", 404, "not found", None, None)
def test_retry_on_HTTPError(self):
Modified: trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py (268548 => 268549)
--- trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py 2020-10-15 19:55:00 UTC (rev 268548)
+++ trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py 2020-10-15 20:24:15 UTC (rev 268549)
@@ -93,9 +93,7 @@
# Note: all of the methods must follow the "_install_XXX" convention in
# order for autoinstall_everything(), below, to work properly.
- if '.mechanize' in fullname:
- self._install_mechanize()
- elif '.pylint' in fullname:
+ if '.pylint' in fullname:
self._install_pylint()
elif '.buildbot' in fullname:
self._install_buildbot()
@@ -110,11 +108,6 @@
elif '.bs4' in fullname:
self._install_beautifulsoup()
- def _install_mechanize(self):
- self._ensure_autoinstalled_dir_is_in_sys_path()
- self._install("https://files.pythonhosted.org/packages/64/f1/1aa4c96dea14e17a955019b0fc4ac1b8dfbc50e3c90970c1fb8882e74a7b/mechanize-0.4.3.tar.gz",
- "mechanize-0.4.3/mechanize")
-
def _install_keyring(self):
self._install("https://files.pythonhosted.org/packages/7d/a9/8c6bf60710781ce13a9987c0debda8adab35eb79c6b5525f7fe5240b7a8a/keyring-7.3.1.tar.gz",
"keyring-7.3.1/keyring")
