Global variables are evil. Tests under both py2k and py3k pass.

1 files changed, 2 insertions, 7 deletions

diff --git a/whitelist.py b/whitelist.py
index 7eb111e..d12aea3 100644
--- a/whitelist.py
+++ b/whitelist.py
@@ -40,14 +40,9 @@ class whitelist(object):
         log_fh.setFormatter(log_fmt)
         self.logger.addHandler(log_fh)
 
-        try:
-            wlp.setfilebyname(wlfile)
-        except Exception as ex:
-            self.logger.exception('Opening %s: %s', wlfile, ex)
-            sys.exit(1)
-
         # dict is a { ownername : {variable: value}} dictionary of dictionaries
-        self.wl = wlp.mkdict()
+        with open(wlfile) as inf:
+            self.wl = wlp.mkdict(inf)
 
     def checkfrom(self, fromhead):
         """have you permission to be here, sir?"""