git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch
[plcapi.git]
/
PLC
/
API.py
diff --git
a/PLC/API.py
b/PLC/API.py
index
5136341
..
5c4cb9d
100644
(file)
--- a/
PLC/API.py
+++ b/
PLC/API.py
@@
-5,7
+5,7
@@
# Mark Huang <mlhuang@cs.princeton.edu>
#
# Copyright (C) 2004-2006 The Trustees of Princeton University
# Mark Huang <mlhuang@cs.princeton.edu>
#
# Copyright (C) 2004-2006 The Trustees of Princeton University
-# $Id: API.py
,v 1.7 2006/10/30 16:37:11 mlhuang Exp
$
+# $Id: API.py
5574 2007-10-25 20:33:17Z thierry
$
#
import sys
#
import sys
@@
-83,7
+83,6
@@
except ImportError:
from PLC.Config import Config
from PLC.Faults import *
import PLC.Methods
from PLC.Config import Config
from PLC.Faults import *
import PLC.Methods
-from PLC.sendmail import sendmail
class PLCAPI:
methods = PLC.Methods.methods
class PLCAPI:
methods = PLC.Methods.methods
@@
-98,9
+97,6
@@
class PLCAPI:
# Load configuration
self.config = Config(config)
# Load configuration
self.config = Config(config)
- # Initialize mailer
- self.mailer = sendmail(self.config)
-
# Initialize database connection
if self.config.PLC_DB_TYPE == "postgresql":
from PLC.PostgreSQL import PostgreSQL
# Initialize database connection
if self.config.PLC_DB_TYPE == "postgresql":
from PLC.PostgreSQL import PostgreSQL