summaryrefslogtreecommitdiff
path: root/morphlib/gitdir.py
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-03-17 11:09:44 +0000
committerGerrit Code Review <gerrit@baserock.org>2015-03-17 11:09:44 +0000
commitcd7fa4119a3850541566b7d20d69515256e0b310 (patch)
treeb8986b02d566f125a59ae2b3b610ead7d3f87e37 /morphlib/gitdir.py
parent60aedc8d97679159678e7ebad2f2d81768e9736a (diff)
parentaab6f2b5d3621d5760145d133a72495ef2ac1f25 (diff)
downloadmorph-cd7fa4119a3850541566b7d20d69515256e0b310.tar.gz
Merge "Use python3 compatible notation for catching exceptions"
Diffstat (limited to 'morphlib/gitdir.py')
-rw-r--r--morphlib/gitdir.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/morphlib/gitdir.py b/morphlib/gitdir.py
index 34791b3f..03640a22 100644
--- a/morphlib/gitdir.py
+++ b/morphlib/gitdir.py
@@ -706,7 +706,7 @@ class GitDirectory(object):
# this ensures it will fail if the branch already exists
try:
return self._update_ref((ref, sha1, '0' * 40), message)
- except Exception, e:
+ except Exception as e:
raise RefAddError(self, ref, sha1, e)
def update_ref(self, ref, sha1, old_sha1, message=None):
@@ -726,7 +726,7 @@ class GitDirectory(object):
self._check_is_sha1(old_sha1)
try:
return self._update_ref((ref, sha1, old_sha1), message)
- except Exception, e:
+ except Exception as e:
raise RefUpdateError(self, ref, old_sha1, sha1, e)
def delete_ref(self, ref, old_sha1, message=None):
@@ -744,7 +744,7 @@ class GitDirectory(object):
self._check_is_sha1(old_sha1)
try:
return self._update_ref(('-d', ref, old_sha1), message)
- except Exception, e:
+ except Exception as e:
raise RefDeleteError(self, ref, old_sha1, e)
def describe(self):