From: Tony Mack Date: Fri, 5 Jan 2007 16:09:09 +0000 (+0000) Subject: - added sendmail object ('mailer') as a member of PLCAPI class X-Git-Tag: pycurl-7_13_1~171 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=801365be2d2282e4ed6757f91651179f2f9258d9;p=plcapi.git - added sendmail object ('mailer') as a member of PLCAPI class --- diff --git a/PLC/API.py b/PLC/API.py index 783463e..5136341 100644 --- a/PLC/API.py +++ b/PLC/API.py @@ -5,7 +5,7 @@ # Mark Huang # # Copyright (C) 2004-2006 The Trustees of Princeton University -# $Id: API.py,v 1.6 2006/10/27 18:57:32 mlhuang Exp $ +# $Id: API.py,v 1.7 2006/10/30 16:37:11 mlhuang Exp $ # import sys @@ -83,6 +83,7 @@ except ImportError: from PLC.Config import Config from PLC.Faults import * import PLC.Methods +from PLC.sendmail import sendmail class PLCAPI: methods = PLC.Methods.methods @@ -96,13 +97,17 @@ class PLCAPI: # Load configuration self.config = Config(config) - - # Initialize database connection + + # Initialize mailer + self.mailer = sendmail(self.config) + + # Initialize database connection if self.config.PLC_DB_TYPE == "postgresql": from PLC.PostgreSQL import PostgreSQL self.db = PostgreSQL(self) + else: - raise PLCAPIError, "Unsupported database type " + config.PLC_DB_TYPE + raise PLCAPIError, "Unsupported database type " + self.config.PLC_DB_TYPE def callable(self, method): """