Title: [183701] trunk/Tools
Revision
183701
Author
[email protected]
Date
2015-05-01 17:23:58 -0700 (Fri, 01 May 2015)

Log Message

check-webkit-style fails due to system pylint
https://bugs.webkit.org/show_bug.cgi?id=144360

Patch by Mario Sanchez Prada <[email protected]> on 2015-05-01
Reviewed by Darin Adler.

Make sure that the directory containing third party autoinstalled modules
is at the beginning of the search path, to avoid conflicts with other
versions of the same modules installed in the system (e.g. pylint).

* Scripts/webkitpy/thirdparty/__init__.py: Prepend the autoinstalled
modules directory to sys.path, instead of appending it.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (183700 => 183701)


--- trunk/Tools/ChangeLog	2015-05-01 23:59:58 UTC (rev 183700)
+++ trunk/Tools/ChangeLog	2015-05-02 00:23:58 UTC (rev 183701)
@@ -1,5 +1,19 @@
 2015-05-01  Mario Sanchez Prada  <[email protected]>
 
+        check-webkit-style fails due to system pylint
+        https://bugs.webkit.org/show_bug.cgi?id=144360
+
+        Reviewed by Darin Adler.
+
+        Make sure that the directory containing third party autoinstalled modules
+        is at the beginning of the search path, to avoid conflicts with other
+        versions of the same modules installed in the system (e.g. pylint).
+
+        * Scripts/webkitpy/thirdparty/__init__.py: Prepend the autoinstalled
+        modules directory to sys.path, instead of appending it.
+
+2015-05-01  Mario Sanchez Prada  <[email protected]>
+
         Unreviewed, updated my list of email addresses.
 
         * Scripts/webkitpy/common/config/contributors.json: Updated.

Modified: trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py (183700 => 183701)


--- trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py	2015-05-01 23:59:58 UTC (rev 183700)
+++ trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py	2015-05-02 00:23:58 UTC (rev 183701)
@@ -68,7 +68,7 @@
     def _ensure_autoinstalled_dir_is_in_sys_path(self):
         # Some packages require that the are being put somewhere under a directory in sys.path.
         if not _AUTOINSTALLED_DIR in sys.path:
-            sys.path.append(_AUTOINSTALLED_DIR)
+            sys.path.insert(0, _AUTOINSTALLED_DIR)
 
     def find_module(self, fullname, _):
         # This method will run before each import. See http://www.python.org/dev/peps/pep-0302/
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to