From 97ae58eb0a54e555e9bb516818e64250a70e7d41 Mon Sep 17 00:00:00 2001 From: "dpranke@chromium.org" Date: Fri, 18 Mar 2011 00:29:20 +0000 Subject: [PATCH] Make git_cl (and everything else not skipped under depot_tools) pass pylint cleanly. There should be no functional changes in this patch, although there's at least one minor bug that lint caught. Review URL: http://codereview.chromium.org/6685023 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@78638 0039d316-1c4b-4281-b951-d872f2087c98 --- PRESUBMIT.py | 17 +++-------------- gclient_utils.py | 2 +- git_cl/PRESUBMIT.py | 2 +- git_cl/git_cl.py | 33 +++++++++++++++------------------ 4 files changed, 20 insertions(+), 34 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 2661cba8c..50aa3850c 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -38,14 +38,13 @@ def CommonChecks(input_api, output_api): input_api, output_api, UNIT_TESTS)) - output.extend(WasGitClUploadHookModified(input_api, output_api)) white_list = [r'.*\.py$', r'^git-try$'] black_list = list(input_api.DEFAULT_BLACK_LIST) + [ r'^cpplint\.py$', - r'^git_cl[\/\\].*', - r'^git_cl_repo[\/\\].*', - r'^git_cl[\/\\]test[\/\\]rietveld.*'] + r'^git_cl[\/\\]test[\/\\](local_)?rietveld.*', + r'^git_cl[\/\\]upload.*', + ] output.extend(input_api.canned_checks.RunPylint( input_api, output_api, @@ -65,13 +64,3 @@ def CheckChangeOnCommit(input_api, output_api): input_api, output_api)) return output - - -def WasGitClUploadHookModified(input_api, output_api): - for affected_file in input_api.AffectedSourceFiles(None): - if (input_api.os_path.basename(affected_file.LocalPath()) == - 'git-cl-upload-hook'): - return [output_api.PresubmitPromptWarning( - 'Don\'t forget to fix git-cl to download the newest version of ' - 'git-cl-upload-hook')] - return [] diff --git a/gclient_utils.py b/gclient_utils.py index 64f4dcb28..97c8227c0 100644 --- a/gclient_utils.py +++ b/gclient_utils.py @@ -660,7 +660,7 @@ class ExecutionQueue(object): self.running.append(t) else: t.join() - sys.stdout.full_flush() + sys.stdout.full_flush() # pylint: disable=E1101 if self.progress: self.progress.update(1, t.item.name) assert not t.item.name in self.ran diff --git a/git_cl/PRESUBMIT.py b/git_cl/PRESUBMIT.py index 8d2b16050..c37dce22c 100644 --- a/git_cl/PRESUBMIT.py +++ b/git_cl/PRESUBMIT.py @@ -28,7 +28,7 @@ def RunTests(input_api, output_api): old_sys_path = sys.path try: sys.path = [input_api.PresubmitLocalPath()] + sys.path - from test import local_rietveld + from test import local_rietveld # pylint: disable=W0403 server = local_rietveld.LocalRietveld() finally: sys.path = old_sys_path diff --git a/git_cl/git_cl.py b/git_cl/git_cl.py index d3ae4f7d2..2005c19cd 100644 --- a/git_cl/git_cl.py +++ b/git_cl/git_cl.py @@ -7,20 +7,20 @@ import logging import optparse import os import re -import StringIO import subprocess import sys import tempfile import textwrap -import upload import urlparse import urllib2 try: - import readline + import readline # pylint: disable=W0611 except ImportError: pass +# TODO(dpranke): don't use relative import. +import upload # pylint: disable=W0403 try: # TODO(dpranke): We wrap this in a try block for a limited form of # backwards-compatibility with older versions of git-cl that weren't @@ -29,7 +29,7 @@ try: # once this has baked for a while and things seem safe. depot_tools_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) sys.path.append(depot_tools_path) - import breakpad + import breakpad # pylint: disable=W0611 except ImportError: pass @@ -584,7 +584,7 @@ def LoadCodereviewSettingsFromFile(fileobj): def CMDconfig(parser, args): """edit configuration for this tree""" - (options, args) = parser.parse_args(args) + _, args = parser.parse_args(args) if len(args) == 0: GetCodereviewSettingsInteractively() return 0 @@ -650,7 +650,7 @@ def CMDissue(parser, args): Pass issue number 0 to clear the current issue. """ - (options, args) = parser.parse_args(args) + _, args = parser.parse_args(args) cl = Changelist() if len(args) > 0: @@ -1170,11 +1170,11 @@ def CMDpatch(parser, args): if len(args) != 1: parser.print_help() return 1 - input = args[0] + issue_arg = args[0] if re.match(r'\d+', input): # Input is an issue id. Figure out the URL. - issue = input + issue = issue_arg server = settings.GetDefaultServerUrl() fetch = urllib2.urlopen('%s/%s' % (server, issue)).read() m = re.search(r'/download/issue[0-9]+_[0-9]+.diff', fetch) @@ -1184,8 +1184,8 @@ def CMDpatch(parser, args): url = '%s%s' % (server, m.group(0).strip()) else: # Assume it's a URL to the patch. Default to http. - input = FixUrl(input) - match = re.match(r'.*?/issue(\d+)_\d+.diff', input) + issue_url = FixUrl(issue_arg) + match = re.match(r'.*?/issue(\d+)_\d+.diff', issue_url) if match: issue = match.group(1) url = input @@ -1270,14 +1270,11 @@ def GetTreeStatusReason(): # on python 2.5 and it is only used for git-cl tree which isn't often used, # forcing everyone to install simplejson isn't efficient. try: - import simplejson as json + import simplejson as json # pylint: disable=F0401 except ImportError: try: import json - # Some versions of python2.5 have an incomplete json module. Check to make - # sure loads exists. - json.loads - except (ImportError, AttributeError): + except ImportError: print >> sys.stderr, 'Please install simplejson' sys.exit(1) @@ -1291,7 +1288,7 @@ def GetTreeStatusReason(): def CMDtree(parser, args): """show the status of the tree""" - (options, args) = parser.parse_args(args) + _, args = parser.parse_args(args) status = GetTreeStatus() if 'unset' == status: print 'You must configure your tree status URL by running "git cl config".' @@ -1307,7 +1304,7 @@ def CMDtree(parser, args): def CMDupstream(parser, args): """print the name of the upstream branch, if any""" - (options, args) = parser.parse_args(args) + _, args = parser.parse_args(args) cl = Changelist() print cl.GetUpstreamBranch() return 0 @@ -1319,7 +1316,7 @@ def Command(name): def CMDhelp(parser, args): """print list of commands or help for a specific command""" - (options, args) = parser.parse_args(args) + _, args = parser.parse_args(args) if len(args) == 1: return main(args + ['--help']) parser.print_help()