From a33276d8da726d7e60908884cb404e56ec907064 Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Sat, 21 Feb 2015 16:03:47 +0100
Subject: Extract exception message in a less arcane way

---
 gbp/scripts/buildpackage.py       | 2 +-
 gbp/scripts/clone.py              | 2 +-
 gbp/scripts/create_remote_repo.py | 2 +-
 gbp/scripts/dch.py                | 2 +-
 gbp/scripts/import_dsc.py         | 4 ++--
 gbp/scripts/import_dscs.py        | 2 +-
 gbp/scripts/import_orig.py        | 4 ++--
 gbp/scripts/import_srpm.py        | 2 +-
 gbp/scripts/pq.py                 | 2 +-
 gbp/scripts/pq_rpm.py             | 2 +-
 gbp/scripts/pull.py               | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'gbp')

diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py
index 419f01d..0497159 100755
--- a/gbp/scripts/buildpackage.py
+++ b/gbp/scripts/buildpackage.py
@@ -622,7 +622,7 @@ def main(argv):
     except CommandExecFailed:
         retval = 1
     except (GbpError, GitRepositoryError) as err:
-        if len(err.__str__()):
+        if str(err):
             gbp.log.err(err)
         retval = 1
     except DebianSourceError as err:
diff --git a/gbp/scripts/clone.py b/gbp/scripts/clone.py
index 5232de9..056092b 100755
--- a/gbp/scripts/clone.py
+++ b/gbp/scripts/clone.py
@@ -121,7 +121,7 @@ def main(argv):
         gbp.log.err("Git command failed: %s" % err)
         retval = 1
     except GbpError as err:
-        if len(err.__str__()):
+        if str(err):
             gbp.log.err(err)
         retval = 1
 
diff --git a/gbp/scripts/create_remote_repo.py b/gbp/scripts/create_remote_repo.py
index 1b0d65b..a6c62d8 100644
--- a/gbp/scripts/create_remote_repo.py
+++ b/gbp/scripts/create_remote_repo.py
@@ -377,7 +377,7 @@ def main(argv):
     except CommandExecFailed:
         retval = 1
     except (GbpError, GitRepositoryError) as err:
-        if len(err.__str__()):
+        if str(err):
             gbp.log.err(err)
         retval = 1
 
diff --git a/gbp/scripts/dch.py b/gbp/scripts/dch.py
index 2df4b2d..d0e9794 100644
--- a/gbp/scripts/dch.py
+++ b/gbp/scripts/dch.py
@@ -542,7 +542,7 @@ def main(argv):
             GitRepositoryError,
             DebianSourceError,
             NoChangeLogError) as err:
-        if len(err.__str__()):
+        if str(err):
             gbp.log.err(err)
         ret = 1
     return ret
diff --git a/gbp/scripts/import_dsc.py b/gbp/scripts/import_dsc.py
index a8a0abd..f0c2a5e 100644
--- a/gbp/scripts/import_dsc.py
+++ b/gbp/scripts/import_dsc.py
@@ -165,7 +165,7 @@ def apply_debian_patch(repo, unpack_dir, src, options, tag):
                             sign=options.sign_tags,
                             keyid=options.keyid)
     except (gbpc.CommandExecFailed, GitRepositoryError) as err:
-        msg = err.__str__() if len(err.__str__()) else ''
+        msg = str(err) or 'Unknown error, please report a bug'
         gbp.log.err("Failed to import Debian package: %s" % msg)
         raise GbpError
     finally:
@@ -402,7 +402,7 @@ def main(argv):
         gbp.log.err("Git command failed: %s" % msg)
         ret = 1
     except GbpError as err:
-        if len(err.__str__()):
+        if str(err):
             gbp.log.err(err)
         ret = 1
     except SkipImport:
diff --git a/gbp/scripts/import_dscs.py b/gbp/scripts/import_dscs.py
index 4e445c3..30451ce 100644
--- a/gbp/scripts/import_dscs.py
+++ b/gbp/scripts/import_dscs.py
@@ -155,7 +155,7 @@ def main(argv):
                 raise GbpError("Failed to import '%s'" % dscs[0].dscfile)
 
     except (GbpError, gbpc.CommandExecFailed, GitRepositoryError) as err:
-        if len(err.__str__()):
+        if str(err):
             gbp.log.err(err)
         ret = 1
     finally:
diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py
index d7ad7b4..d95c08f 100644
--- a/gbp/scripts/import_orig.py
+++ b/gbp/scripts/import_orig.py
@@ -408,10 +408,10 @@ def main(argv):
                                    repo.pristine_tar_branch]:
                 repo.force_head(current_branch, hard=True)
         except (gbpc.CommandExecFailed, GitRepositoryError) as err:
-            msg = err.__str__() if len(err.__str__()) else ''
+            msg = str(err) or 'Unknown error, please report a bug'
             raise GbpError("Import of %s failed: %s" % (source.path, msg))
     except GbpError as err:
-        if len(err.__str__()):
+        if str(err):
             gbp.log.err(err)
         ret = 1
 
diff --git a/gbp/scripts/import_srpm.py b/gbp/scripts/import_srpm.py
index a976f2a..587e2f2 100755
--- a/gbp/scripts/import_srpm.py
+++ b/gbp/scripts/import_srpm.py
@@ -448,7 +448,7 @@ def main(argv):
         gbp.log.err("Git command failed: %s" % err)
         ret = 1
     except GbpError as err:
-        if len(err.__str__()):
+        if str(err):
             gbp.log.err(err)
         ret = 1
     except NoSpecError as err:
diff --git a/gbp/scripts/pq.py b/gbp/scripts/pq.py
index 1e1e96b..4145648 100755
--- a/gbp/scripts/pq.py
+++ b/gbp/scripts/pq.py
@@ -412,7 +412,7 @@ def main(argv):
     except CommandExecFailed:
         retval = 1
     except (GbpError, GitRepositoryError) as err:
-        if len(err.__str__()):
+        if str(err):
             gbp.log.err(err)
         retval = 1
 
diff --git a/gbp/scripts/pq_rpm.py b/gbp/scripts/pq_rpm.py
index 764ccff..a05fdff 100755
--- a/gbp/scripts/pq_rpm.py
+++ b/gbp/scripts/pq_rpm.py
@@ -453,7 +453,7 @@ def main(argv):
         gbp.log.err("Git command failed: %s" % err)
         retval = 1
     except GbpError, err:
-        if len(err.__str__()):
+        if str(err):
             gbp.log.err(err)
         retval = 1
     finally:
diff --git a/gbp/scripts/pull.py b/gbp/scripts/pull.py
index d091198..15e4201 100755
--- a/gbp/scripts/pull.py
+++ b/gbp/scripts/pull.py
@@ -160,7 +160,7 @@ def main(argv):
     except CommandExecFailed:
         retval = 1
     except (GbpError, GitRepositoryError) as err:
-        if len(err.__str__()):
+        if str(err):
             gbp.log.err(err)
         retval = 1
 
-- 
cgit v1.2.3