diff options
Diffstat (limited to 'morphlib/branchmanager.py')
| -rw-r--r-- | morphlib/branchmanager.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/morphlib/branchmanager.py b/morphlib/branchmanager.py index a33b4ccb..92a1f4be 100644 --- a/morphlib/branchmanager.py +++ b/morphlib/branchmanager.py @@ -1,4 +1,4 @@ -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2013,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 @@ -92,7 +91,7 @@ class LocalRefManager(object): op, args = d.pop() try: op(*args) - except Exception, e: + except Exception as e: exceptions.append((op, args, e)) if exceptions: raise RefCleanupError(primary, exceptions) @@ -201,7 +200,7 @@ class RemoteRefManager(object): remote, refspecs = d.pop() try: remote.push(*refspecs) - except Exception, e: + except Exception as e: exceptions.append((remote, refspecs, e)) if exceptions: raise RefCleanupError(primary, exceptions) |