From 7fb9295394893e476d4f1745a774ce8cb523d48a Mon Sep 17 00:00:00 2001
From: Erik Rose <erik@mozilla.com>
Date: Mon, 30 Nov 2015 17:26:13 -0500
Subject: [PATCH] Find a better semantic for HumanException.

These are the exceptions that are likely to happen, so we give them extra, human-readable descriptions.

Also, name them more in line with stdlib exceptions.
---
 booty.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/booty.sh b/booty.sh
index 2d950068d..fb98172fd 100755
--- a/booty.sh
+++ b/booty.sh
@@ -47,7 +47,7 @@ I2OU8tPRzqKdQ6AwS9wvqscCAwEAAQ==
 """  # TODO: Replace with real one.
 
 
-class HumanException(Exception):
+class ExpectedError(Exception):
     """A novice-readable exception that also carries the original exception for
     debugging"""
 
@@ -66,13 +66,13 @@ class HttpsGetter(object):
     def get(self, url):
         """Return the document contents pointed to by an HTTPS URL.
 
-        If something goes wrong (404, timeout, etc.), raise HumanException.
+        If something goes wrong (404, timeout, etc.), raise ExpectedError.
 
         """
         try:
             return self._opener.open(url).read()
         except (HTTPError, IOError) as exc:
-            raise HumanException("Couldn't download %s." % url, exc)
+            raise ExpectedError("Couldn't download %s." % url, exc)
 
 
 class TempDir(object):
@@ -100,7 +100,7 @@ def verified_new_le_auto(get, tag, temp):
     """Return the path to a verified, up-to-date letsencrypt-auto script.
 
     If the download's signature does not verify or something else goes wrong,
-    raise HumanException.
+    raise ExpectedError.
 
     """
     root = ('https://raw.githubusercontent.com/letsencrypt/letsencrypt/%s/' %
@@ -119,8 +119,8 @@ def verified_new_le_auto(get, tag, temp):
                        stdout=dev_null,
                        stderr=dev_null)
     except CalledProcessError as exc:
-        raise HumanException("Couldn't verify signature of downloaded "
-                             "letsencrypt-auto.", exc)
+        raise ExpectedError("Couldn't verify signature of downloaded "
+                            "letsencrypt-auto.", exc)
     else:  # belt & suspenders
         return le_auto_path
 
@@ -131,7 +131,7 @@ def main():
     try:
         stable_tag = 'v' + latest_stable_version(get, 'letsencrypt')
         print verified_new_le_auto(get, stable_tag, temp)
-    except HumanException as exc:
+    except ExpectedError as exc:
         print exc.args[0], exc.args[1]
         return 1
     else: