diff options
| author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 20:57:45 +0000 |
|---|---|---|
| committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 20:57:45 +0000 |
| commit | 07c54c0f081126ba025122c66cb37fe82a67cd5f (patch) | |
| tree | 47526c4cf5809fbfc94774c617bb9163376b2cd7 /webkit/tools | |
| parent | 2ac1e7ca438583c681cbb686122f3ec69fa1d5ff (diff) | |
| download | chromium_src-07c54c0f081126ba025122c66cb37fe82a67cd5f.zip chromium_src-07c54c0f081126ba025122c66cb37fe82a67cd5f.tar.gz chromium_src-07c54c0f081126ba025122c66cb37fe82a67cd5f.tar.bz2 | |
Force our "google" modules to be found first.
This fixes an issue with python2.6 (on Ubuntu Karmic at least) where
'/usr/lib/pymodules/python2.6/google' is found before 'tools/python/google',
resulting in a "No module named httpd_utils" error when importing
google.httpd_utils.
Review URL: http://codereview.chromium.org/661377
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40425 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rwxr-xr-x | webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/http_server.py | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/websocket_server.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/http_server.py b/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/http_server.py index 43adac7..747702c 100755 --- a/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/http_server.py +++ b/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/http_server.py @@ -20,7 +20,7 @@ import http_server_base import path_utils # So we can import httpd_utils below to make ui_tests happy. -sys.path.append(path_utils.path_from_base('tools', 'python')) +sys.path.insert(0, path_utils.path_from_base('tools', 'python')) import google.httpd_utils diff --git a/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/websocket_server.py b/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/websocket_server.py index 72c4095..8237c3c 100644 --- a/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/websocket_server.py +++ b/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/websocket_server.py @@ -19,7 +19,7 @@ import platform_utils import http_server # So we can import httpd_utils below to make ui_tests happy. -sys.path.append(path_utils.path_from_base('tools', 'python')) +sys.path.insert(0, path_utils.path_from_base('tools', 'python')) import google.httpd_utils _WS_LOG_PREFIX = 'pywebsocket.ws.log-' |