From 394a6c619cd9458fbd659a70963485b9519cbc04 Mon Sep 17 00:00:00 2001
From: Ben Brown <ben.brown@codethink.co.uk>
Date: Tue, 21 Jan 2014 12:23:08 +0000
Subject: Fixup code

---
 overseerlib/parseyaml.py | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

(limited to 'overseerlib/parseyaml.py')

diff --git a/overseerlib/parseyaml.py b/overseerlib/parseyaml.py
index 664f265..8aacfa7 100644
--- a/overseerlib/parseyaml.py
+++ b/overseerlib/parseyaml.py
@@ -23,21 +23,12 @@ import cliapp
 
 class ParseYAML(object):
 
-    def parse_yaml(self, self.settings['config-name']):
-        sender = 'ben.brown@codethink.co.uk'
-        username = 'benbrown'
-        password = getpass.getpass()
-        recipients = ['ben.brown@codethink.co.uk']
-        composed_message = '''\
-From: %s
-To: %s
-Subject: Test
-
-%s
-        ''' % (sender, ', '.join(recipients), content)
-        server = smtplib.SMTP_SSL('imap.codethink.co.uk')
-        server.login(username, password)
+    def load_config(self, config):
+        with open(config) as f:
+            text = f.read()
         try:
-            server.sendmail(sender, recipients, composed_message)
-        finally:
-            server.close
+            obj = yaml.safe_load(text)
+        except yaml.error.YAMLError as e:
+            raise cliapp.AppException('Could not load configuration file')
+
+        return obj
-- 
cgit v1.2.1