summaryrefslogtreecommitdiff
path: root/gbp/scripts/import_dsc.py
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2012-07-02 08:05:06 +0200
committerGuido Günther <agx@sigxcpu.org>2012-07-02 08:53:04 +0200
commite6e0150e07be32b91624b460b67be39b8f6b0ab9 (patch)
treeebf593199d58f8a46d3bbeae3335258c6e264d54 /gbp/scripts/import_dsc.py
parent92a744e5c8e9751f7336ddaac597ded2a7456d8f (diff)
Make exception syntax consistent
Diffstat (limited to 'gbp/scripts/import_dsc.py')
-rw-r--r--gbp/scripts/import_dsc.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/gbp/scripts/import_dsc.py b/gbp/scripts/import_dsc.py
index 879b537..15fa7ea 100644
--- a/gbp/scripts/import_dsc.py
+++ b/gbp/scripts/import_dsc.py
@@ -71,7 +71,7 @@ def apply_patch(diff):
if ret:
gbp.log.err("Error import %s: %d" % (diff, ret))
return False
- except OSError, err:
+ except OSError as err:
gbp.log.err("Error importing %s: %s" % (diff, err[0]))
return False
return True
@@ -183,7 +183,7 @@ def parse_args(argv):
try:
parser = GbpOptionParserDebian(command=os.path.basename(argv[0]), prefix='',
usage='%prog [options] /path/to/package.dsc')
- except ConfigParser.ParsingError, err:
+ except ConfigParser.ParsingError as err:
gbp.log.err(err)
return None, None
@@ -261,7 +261,7 @@ def main(argv):
src = parse_dsc(dsc)
if src.pkgformat not in [ '1.0', '3.0' ]:
- raise GbpError, "Importing %s source format not yet supported." % src.pkgformat
+ raise GbpError("Importing %s source format not yet supported." % src.pkgformat)
if options.verbose:
print_dsc(src)
@@ -272,7 +272,7 @@ def main(argv):
(clean, out) = repo.is_clean()
if not clean and not is_empty:
gbp.log.err("Repository has uncommitted changes, commit these first: ")
- raise GbpError, out
+ raise GbpError(out)
except GitRepositoryError:
# no repo found, create one
@@ -357,10 +357,10 @@ def main(argv):
gbp.log.err("Interrupted. Aborting.")
except gbpc.CommandExecFailed:
ret = 1
- except GitRepositoryError, msg:
+ except GitRepositoryError as msg:
gbp.log.err("Git command failed: %s" % msg)
ret = 1
- except GbpError, err:
+ except GbpError as err:
if len(err.__str__()):
gbp.log.err(err)
ret = 1