commit a5be53f9c809009e67f217c00b8f30246aacc237
author Sarah Owens <sarato@inkylabs.com> Sun Sep 09 15:37:57 2012 -0700
committer Sarah Owens <sarato@inkylabs.com> Tue Oct 23 21:35:59 2012 -0700
tree 7ab0da1fd31968eee882de81df8c9b93ae52fdfb
parent 9ed12c5d9cda1f010bc173b0bc622d59e96b0dd0

Use modern Python exception syntax

"except Exception as e" instead of "except Exception, e"

This is part of a transition to supporting Python 3.  Python >= 2.6
support "as" syntax.

Note: this removes Python 2.5 support.

Change-Id: I309599f3981bba2b46111c43102bee38ff132803

subcmds/upload.py

diff --git a/subcmds/upload.py b/subcmds/upload.py
index 685e342..84a5e44 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -329,7 +329,7 @@
 
         branch.UploadForReview(people, auto_topic=opt.auto_topic, draft=opt.draft)
         branch.uploaded = True
-      except UploadError, e:
+      except UploadError as e:
         branch.error = e
         branch.uploaded = False
         have_errors = True
@@ -384,7 +384,7 @@
       pending_proj_names = [project.name for (project, avail) in pending]
       try:
         hook.Run(opt.allow_all_hooks, project_list=pending_proj_names)
-      except HookError, e:
+      except HookError as e:
         print >>sys.stderr, "ERROR: %s" % str(e)
         return