Avoid "During handling of the above exception" when re-raising.

1 files changed, 6 insertions, 4 deletions

diff --git a/gnunet/__init__.py b/gnunet/__init__.py
index c4c5648..5bae6f0 100644
--- a/gnunet/__init__.py
+++ b/gnunet/__init__.py
@@ -14,10 +14,12 @@ class _Key:
         else:
             try:
                 self._data = bytearray(arg)
-            except:
-                raise TypeError("'arg' must be a %s, a string or an array "
-                                "of bytes. Not a '%s'." %
-                                (type(self).__name__, type(arg).__name__),)
+            except TypeError as e:
+                # HACK: replace the exception message
+                e.args = ("'arg' must be a %s, a string or an array "
+                          "of bytes. Not a '%s'." %
+                          (type(self).__name__, type(arg).__name__),)
+                raise
 
         if len(self._data) * 8 != self.__bits__:
             raise ValueError("'arg' must be a %s bit hash. Got %s bits."