summaryrefslogtreecommitdiff
path: root/morphlib/git.py
diff options
context:
space:
mode:
Diffstat (limited to 'morphlib/git.py')
-rw-r--r--morphlib/git.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/morphlib/git.py b/morphlib/git.py
index 456aa4c0..acda6137 100644
--- a/morphlib/git.py
+++ b/morphlib/git.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2014 Codethink Limited
+# Copyright (C) 2011-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
@@ -191,7 +190,7 @@ def get_user_name(runcmd):
try:
config = check_config_set(runcmd, keys={"user.name": "My Name"})
return config['user.name']
- except ConfigNotSetException, e:
+ except ConfigNotSetException as e:
raise IdentityNotSetException(e.missing)
@@ -202,7 +201,7 @@ def get_user_email(runcmd):
try:
cfg = check_config_set(runcmd, keys={"user.email": "me@example.com"})
return cfg['user.email']
- except ConfigNotSetException, e:
+ except ConfigNotSetException as e:
raise IdentityNotSetException(e.missing)
def check_config_set(runcmd, keys, cwd='.'):