diff options
author | Ben Brown <ben.brown@codethink.co.uk> | 2014-01-21 12:23:08 +0000 |
---|---|---|
committer | Ben Brown <ben.brown@codethink.co.uk> | 2014-01-21 12:38:22 +0000 |
commit | 394a6c619cd9458fbd659a70963485b9519cbc04 (patch) | |
tree | f33ea2dec2b5cccac9095fc6b2c6295b5e12906d /overseerlib/parseyaml.py | |
parent | 451ee498abbf5a4b7986954a561e4bda94955e72 (diff) | |
download | trove-overseer-394a6c619cd9458fbd659a70963485b9519cbc04.tar.gz |
Fixup code
Diffstat (limited to 'overseerlib/parseyaml.py')
-rw-r--r-- | overseerlib/parseyaml.py | 25 |
1 files changed, 8 insertions, 17 deletions
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 |