svn keywords

[plcapi.git] / PLC / Shell.py

diff --git a/PLC/Shell.py b/PLC/Shell.py
index 7f05023..9069a09 100644 (file)
--- a/PLC/Shell.py
+++ b/PLC/Shell.py
@@ -5,7 +5,8 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005 The Trustees of Princeton University
 #
-# $Id: Shell.py,v 1.3 2007/01/16 16:25:12 thierry Exp $
+# $Id$
+# $URL$
 #
 
 import os
@@ -108,8 +109,8 @@ class Shell:
                       ":" + str(self.config.PLC_API_PORT) + \
                       "/" + self.config.PLC_API_PATH + "/"
 
-            if cacert is None and self.config is not None:
-                cacert = self.config.PLC_API_CA_SSL_CRT
+                if cacert is None:
+                    cacert = self.config.PLC_API_CA_SSL_CRT
 
             self.url = url
             if cacert is not None:
@@ -165,7 +166,7 @@ class Shell:
             if role is not None:
                 self.auth['Role'] = role
 
-        for method in PLC.Methods.methods:
+        for method in PLC.API.PLCAPI.all_methods:
             api_function = self.api.callable(method)
 
             if self.server is None: