git_cl: stop using deprecated except syntax

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld and Gerrit."""
 
 from distutils.version import LooseVersion
@@ skipping 1305 matching lines @@
     return self._codereview_impl.UpdateDescriptionRemote(description)
 
   def RunHook(self, committing, may_prompt, verbose, change):
     """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
     try:
       return presubmit_support.DoPresubmitChecks(change, committing,
           verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
           default_presubmit=None, may_prompt=may_prompt,
           rietveld_obj=self._codereview_impl.GetRieveldObjForPresubmit(),
           gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
-    except presubmit_support.PresubmitFailure, e:
+    except presubmit_support.PresubmitFailure as e:
       DieWithError(
           ('%s\nMaybe your depot_tools is out of date?\n'
            'If all fails, contact maruel@') % e)
 
   def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
     """Fetches and applies the issue patch from codereview to local branch."""
     if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
       parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
     else:
       # Assume url.
@@ skipping 369 matching lines @@
   def CloseIssue(self):
     return self.RpcServer().close_issue(self.GetIssue())
 
   def SetFlag(self, flag, value):
     """Patchset must match."""
     if not self.GetPatchset():
       DieWithError('The patchset needs to match. Send another patchset.')
     try:
       return self.RpcServer().set_flag(
           self.GetIssue(), self.GetPatchset(), flag, value)
-    except urllib2.HTTPError, e:
+    except urllib2.HTTPError as e:
       if e.code == 404:
         DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
       if e.code == 403:
         DieWithError(
             ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
              'match?') % (self.GetIssue(), self.GetPatchset()))
       raise
 
   def RpcServer(self):
     """Returns an upload.RpcServer() to access this review's rietveld instance.
@@ skipping 3115 matching lines @@
       RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
 
   # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
   # formatted. This is used to block during the presubmit.
   return_value = 0
 
   if clang_diff_files:
     # Locate the clang-format binary in the checkout
     try:
       clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
-    except clang_format.NotFoundError, e:
+    except clang_format.NotFoundError as e:
       DieWithError(e)
 
     if opts.full:
       cmd = [clang_format_tool]
       if not opts.dry_run and not opts.diff:
         cmd.append('-i')
       stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
       if opts.diff:
         sys.stdout.write(stdout)
     else:
       env = os.environ.copy()
       env['PATH'] = str(os.path.dirname(clang_format_tool))
       try:
         script = clang_format.FindClangFormatScriptInChromiumTree(
             'clang-format-diff.py')
-      except clang_format.NotFoundError, e:
+      except clang_format.NotFoundError as e:
         DieWithError(e)
 
       cmd = [sys.executable, script, '-p0']
       if not opts.dry_run and not opts.diff:
         cmd.append('-i')
 
       diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
       diff_output = RunGit(diff_cmd)
 
       stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
@@ skipping 135 matching lines @@
   # Reload settings.
   global settings
   settings = Settings()
 
   colorize_CMDstatus_doc()
   dispatcher = subcommand.CommandDispatcher(__name__)
   try:
     return dispatcher.execute(OptionParser(), argv)
   except auth.AuthenticationError as e:
     DieWithError(str(e))
-  except urllib2.HTTPError, e:
+  except urllib2.HTTPError as e:
     if e.code != 500:
       raise
     DieWithError(
         ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
           'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
   return 0
 
 
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   setup_color.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)