Make git_cl pass pylint cleanly

git_cl/git_cl.py

 #!/usr/bin/python
 # git-cl -- a git-command for integrating reviews on Rietveld
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 import errno
 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
   # dependent on depot_tools. This version should still work outside of
   # depot_tools as long as --bypass-hooks is used. We should remove this
   # 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
 
 DEFAULT_SERVER = 'http://codereview.appspot.com'
 POSTUPSTREAM_HOOK_PATTERN = '.git/hooks/post-cl-%s'
 DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
 
 def DieWithError(message):
   print >> sys.stderr, message
   sys.exit(1)
@@ skipping 557 matching lines @@
     #PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
     #ORIGIN_URL_CONFIG: http://src.chromium.org/git
     RunGit(['config', keyvals['PUSH_URL_CONFIG'],
             keyvals['ORIGIN_URL_CONFIG']])
 
 
 @usage('[repo root containing codereview.settings]')
 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
 
   url = args[0]
   if not url.endswith('codereview.settings'):
     url = os.path.join(url, 'codereview.settings')
 
   # Load code review settings and download hooks (if available).
   LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
@@ skipping 45 matching lines @@
     print cl.GetDescription(pretty=True)
   return 0
 
 
 @usage('[issue_number]')
 def CMDissue(parser, args):
   """Set or display the current code review issue number.
 
   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:
     try:
       issue = int(args[0])
     except ValueError:
       DieWithError('Pass a number to set the issue or none to list it.\n'
           'Maybe you want to run git cl status?')
     cl.SetIssue(issue)
   print 'Issue number:', cl.GetIssue(), '(%s)' % cl.GetIssueURL()
@@ skipping 497 matching lines @@
   parser.add_option('-f', action='store_true', dest='force',
                     help='with -b, clobber any existing branch')
   parser.add_option('--reject', action='store_true', dest='reject',
                     help='allow failed patches and spew .rej files')
   parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
                     help="don't commit after patch applies")
   (options, args) = parser.parse_args(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)
     if not m:
       DieWithError('Must pass an issue ID or full URL for '
           '\'Download raw patch set\'')
     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
     else:
       DieWithError('Must pass an issue ID or full URL for '
           '\'Download raw patch set\'')
 
   if options.newbranch:
     if options.force:
       RunGit(['branch', '-D', options.newbranch],
@@ skipping 62 matching lines @@
       return 'open'
     return 'unknown'
   return 'unset'
 
 
 def GetTreeStatusReason():
   """Fetches the tree status from a json url and returns the message
   with the reason for the tree to be opened or closed."""
   # Don't import it at file level since simplejson is not installed by default
   # 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.

[M-A Ruel, 2011/03/13 20:45:48]

We need to change that once git-cl is moved one directory up since simplejson is
included in depot_tools/third_party.

   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):
+      if not json.loads:

[M-A Ruel, 2011/03/13 20:45:48]

We don't need this check anymore.

+        raise ImportError
+    except (ImportError):
       print >> sys.stderr, 'Please install simplejson'
       sys.exit(1)
 
   url = settings.GetTreeStatusUrl()
   json_url = urlparse.urljoin(url, '/current?format=json')
   connection = urllib2.urlopen(json_url)
   status = json.loads(connection.read())
   connection.close()
   return status['message']
 
 
 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".'
     return 2
 
   print "The tree is %s" % status
   print
   print GetTreeStatusReason()
   if status != 'open':
     return 1
   return 0
 
 
 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
 
 
 def Command(name):
   return getattr(sys.modules[__name__], 'CMD' + name, None)
 
 
 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()
   return 0
 
 
 def GenUsage(parser, command):
   """Modify an OptParse object with the function's documentation."""
   obj = Command(command)
   more = getattr(obj, 'usage_more', '')
@@ skipping 40 matching lines @@
             ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
              'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
   # Not a known command. Default to help.
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))