From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 25 Oct 2018 16:04:44 +0000 (+0100)
Subject: main: Drop daft try/expect
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~matthewv/git?a=commitdiff_plain;h=83f359fbb21d71af8c8add1e463e209947934b9d;p=irc.git

main: Drop daft try/expect

This serves only to obfuscate.  The result is that, for example, if
you don't have the twitter module, you get this error message:
  acrobat: configuration module Servus-chiark.py not found
which is a lie.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/acrobat.py b/acrobat.py
index 0d9202e..7665d5f 100755
--- a/acrobat.py
+++ b/acrobat.py
@@ -81,11 +81,7 @@ def main():
     if len(sys.argv) < 2:
 	print "acrobat: provide configuration module name on command line"
 	sys.exit(1)
-    try:
-	c=__import__(sys.argv[1])
-    except ImportError:
-	print "acrobat: configuration module "+sys.argv[1]+".py not found"
-	sys.exit(1)
+    c=__import__(sys.argv[1])
     # Override configuration items from the rest of the command line
     for opt in sys.argv[2:]:
         (key,value)=opt.split("=")