Title: [267728] trunk/Tools
Revision
267728
Author
[email protected]
Date
2020-09-28 23:25:46 -0700 (Mon, 28 Sep 2020)

Log Message

[webkitpy] Use webkitcorepy's auto installer for pycodestyle (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=215427
<rdar://problem/66931291>

Unreviewed follow-up fix.

Conflict resolution at some point broke the original change.


* Scripts/webkitpy/style/checkers/python.py: Import directly from pycodestyle.
* Scripts/webkitpy/thirdparty/__init__.py:
(AutoinstallImportHook._install_pycodestyle): Deleted.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (267727 => 267728)


--- trunk/Tools/ChangeLog	2020-09-29 05:51:12 UTC (rev 267727)
+++ trunk/Tools/ChangeLog	2020-09-29 06:25:46 UTC (rev 267728)
@@ -1,3 +1,17 @@
+2020-09-28  Jonathan Bedard  <[email protected]>
+
+        [webkitpy] Use webkitcorepy's auto installer for pycodestyle (Follow-up fix)
+        https://bugs.webkit.org/show_bug.cgi?id=215427
+        <rdar://problem/66931291>
+
+        Unreviewed follow-up fix.
+
+        Conflict resolution at some point broke the original change.
+
+        * Scripts/webkitpy/style/checkers/python.py: Import directly from pycodestyle.
+        * Scripts/webkitpy/thirdparty/__init__.py:
+        (AutoinstallImportHook._install_pycodestyle): Deleted.
+
 2020-09-28  Mark Lam  <[email protected]>
 
         Add Bounds Check Elimination validation for debugging.

Modified: trunk/Tools/Scripts/webkitpy/style/checkers/python.py (267727 => 267728)


--- trunk/Tools/Scripts/webkitpy/style/checkers/python.py	2020-09-29 05:51:12 UTC (rev 267727)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/python.py	2020-09-29 06:25:46 UTC (rev 267728)
@@ -30,8 +30,9 @@
 
 from webkitpy.common.system.filesystem import FileSystem
 from webkitpy.common.webkit_finder import WebKitFinder
-from webkitpy.thirdparty.autoinstalled import pycodestyle
 
+import pycodestyle
+
 from webkitcorepy import OutputCapture
 
 class PythonChecker(object):

Modified: trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py (267727 => 267728)


--- trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py	2020-09-29 05:51:12 UTC (rev 267727)
+++ trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py	2020-09-29 06:25:46 UTC (rev 267728)
@@ -133,10 +133,6 @@
         self._install("https://files.pythonhosted.org/packages/7d/a9/8c6bf60710781ce13a9987c0debda8adab35eb79c6b5525f7fe5240b7a8a/keyring-7.3.1.tar.gz",
                              "keyring-7.3.1/keyring")
 
-    def _install_pycodestyle(self):
-        self._install("https://files.pythonhosted.org/packages/source/p/pycodestyle/pycodestyle-2.5.0.tar.gz",
-                             "pycodestyle-2.5.0/pycodestyle.py")
-
     def _install_pytest_timeout(self):
         self._install("https://files.pythonhosted.org/packages/cc/b7/b2a61365ea6b6d2e8881360ae7ed8dad0327ad2df89f2f0be4a02304deb2/pytest-timeout-1.2.0.tar.gz",
                               "pytest-timeout-1.2.0/pytest_timeout.py")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to