From 22a6876246b2368615b9a1ff45f3e549badb63a4 Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Wed, 20 Jun 2012 00:57:37 +0000 Subject: [PATCH] Fix Pylint presubmit check. First, the environment variable for the child process was created but not specified to subprocess.call(). Second, third_party/logilab/__init__.py tried to initialize itself with pkg_resources. TBR=chrisha@chromium.org BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10582031 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143111 0039d316-1c4b-4281-b951-d872f2087c98 --- presubmit_canned_checks.py | 2 +- tests/presubmit_unittest.py | 3 ++- third_party/logilab/__init__.py | 5 ----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/presubmit_canned_checks.py b/presubmit_canned_checks.py index a5f17dad5..1558ac322 100644 --- a/presubmit_canned_checks.py +++ b/presubmit_canned_checks.py @@ -657,7 +657,7 @@ def RunPylint(input_api, output_api, white_list=None, black_list=None, command = [input_api.python_executable, input_api.os_path.join(_HERE, 'third_party', 'pylint.py')] try: - return input_api.subprocess.call(command + files + extra_args) + return input_api.subprocess.call(command + files + extra_args, env=env) except OSError: return 'Pylint failed!' diff --git a/tests/presubmit_unittest.py b/tests/presubmit_unittest.py index 752a8c8c7..d4c0ac59d 100755 --- a/tests/presubmit_unittest.py +++ b/tests/presubmit_unittest.py @@ -2144,7 +2144,8 @@ class CannedChecksUnittest(PresubmitTestsBase): pylint = os.path.join(_ROOT, 'third_party', 'pylint.py') pylintrc = os.path.join(_ROOT, 'pylintrc') input_api.subprocess.call( - ['pyyyyython', pylint, 'file1.py', '--rcfile=%s' % pylintrc]) + ['pyyyyython', pylint, 'file1.py', '--rcfile=%s' % pylintrc], + env=mox.IgnoreArg()) self.mox.ReplayAll() results = presubmit_canned_checks.RunPylint( diff --git a/third_party/logilab/__init__.py b/third_party/logilab/__init__.py index 2958be492..e69de29bb 100644 --- a/third_party/logilab/__init__.py +++ b/third_party/logilab/__init__.py @@ -1,5 +0,0 @@ -"""generated file, don't modify or your data will be lost""" -try: - __import__('pkg_resources').declare_namespace(__name__) -except ImportError: - pass