diff options
Diffstat (limited to 'morphlib/remoterepocache.py')
| -rw-r--r-- | morphlib/remoterepocache.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/morphlib/remoterepocache.py b/morphlib/remoterepocache.py index 004ba86e..4a6d9fe9 100644 --- a/morphlib/remoterepocache.py +++ b/morphlib/remoterepocache.py @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2014 Codethink Limited +# Copyright (C) 2012-2015 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -10,8 +10,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# with this program. If not, see <http://www.gnu.org/licenses/>. import cliapp @@ -55,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) @@ -74,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) |