Make git_cl pass pylint cleanly

git_cl/git_cl.py

Index: git_cl/git_cl.py
diff --git a/git_cl/git_cl.py b/git_cl/git_cl.py
index 8300cc38404b6bb1f20adf97a4f0c40e9d509de7..ddb5b0b2aed6f8299605157817767757b22b855a 100644
--- a/git_cl/git_cl.py
+++ b/git_cl/git_cl.py
@@ -12,15 +12,16 @@ 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 +30,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
 
@@ -607,7 +608,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
@@ -673,7 +674,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:
@@ -1205,11 +1206,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)
@@ -1219,8 +1220,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
@@ -1305,14 +1306,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):

[M-A Ruel, 2011/03/17 02:09:09]

except ImportError:

       print >> sys.stderr, 'Please install simplejson'
       sys.exit(1)
 
@@ -1326,7 +1324,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".'
@@ -1342,7 +1340,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
@@ -1354,7 +1352,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()