From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 16 Jan 2007 16:25:12 +0000 (+0000)
Subject: does not use pycurl if cacert is None - this is for when regular non-plc boxes are... 
X-Git-Tag: pycurl-7_13_1~108
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=73e009f2fe1c2cd87024751af2ed32afdbbd0d83;p=plcapi.git

does not use pycurl if cacert is None - this is for when regular non-plc boxes are used as clients
---

diff --git a/PLC/Shell.py b/PLC/Shell.py
index d9e812c8..7ab27c47 100644
--- a/PLC/Shell.py
+++ b/PLC/Shell.py
@@ -5,7 +5,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005 The Trustees of Princeton University
 #
-# $Id: Shell.py,v 1.1 2007/01/08 18:10:30 mlhuang Exp $
+# $Id: Shell.py,v 1.2 2007/01/10 21:04:40 mlhuang Exp $
 #
 
 import pydoc
@@ -107,7 +107,10 @@ class Shell:
                 cacert = self.config.PLC_API_CA_SSL_CRT
 
             self.url = url
-            self.server = xmlrpclib.ServerProxy(url, PyCurlTransport(url, cacert), allow_none = 1)
+            if cacert is not None:
+                self.server = xmlrpclib.ServerProxy(url, PyCurlTransport(url, cacert), allow_none = 1)
+            else:
+                self.server = xmlrpclib.ServerProxy(url, allow_none = 1)
 
         # Set up authentication structure