summaryrefslogtreecommitdiff
path: root/morphlib/remoterepocache.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/remoterepocache.py
parent60aedc8d97679159678e7ebad2f2d81768e9736a (diff)
parentaab6f2b5d3621d5760145d133a72495ef2ac1f25 (diff)
downloadmorph-cd7fa4119a3850541566b7d20d69515256e0b310.tar.gz
Merge "Use python3 compatible notation for catching exceptions"
Diffstat (limited to 'morphlib/remoterepocache.py')
-rw-r--r--morphlib/remoterepocache.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/remoterepocache.py b/morphlib/remoterepocache.py
index 49441d71..4a6d9fe9 100644
--- a/morphlib/remoterepocache.py
+++ b/morphlib/remoterepocache.py
@@ -54,7 +54,7 @@ class RemoteRepoCache(object):
repo_url = self._resolver.pull_url(repo_name)
try:
return self._resolve_ref_for_repo_url(repo_url, ref)
- except BaseException, e:
+ except BaseException as e:
logging.error('Caught exception: %s' % str(e))
raise ResolveRefError(repo_name, ref)
@@ -73,7 +73,7 @@ class RemoteRepoCache(object):
try:
info = json.loads(self._ls_tree_for_repo_url(repo_url, ref))
return info['tree'].keys()
- except BaseException, e:
+ except BaseException as e:
logging.error('Caught exception: %s' % str(e))
raise LsTreeError(repo_name, ref)