From: Tony Mack <tmack@cs.princeton.edu>
Date: Fri, 23 Oct 2009 14:45:19 +0000 (+0000)
Subject: api.getCredential should always return a string not an object
X-Git-Tag: sfa-0.9-6~143
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3e1879e47376fc8ef27367a0d864391cfdda9926;p=sfa.git

api.getCredential should always return a string not an object
---

diff --git a/sfa/plc/api.py b/sfa/plc/api.py
index 855b0a9b..01cd8e2d 100644
--- a/sfa/plc/api.py
+++ b/sfa/plc/api.py
@@ -170,7 +170,6 @@ class GeniAPI:
         else:
             return self.getCredentialFromRegistry()
     
-
     def getCredentialFromRegistry(self):
         """ 
         Get our credential from a remote registry using a geniclient connection
@@ -181,7 +180,7 @@ class GeniAPI:
         cred_filename = path + os.sep + filename
         try:
             credential = Credential(filename = cred_filename)
-            return credential
+            return credential.save_to_string(save_parents=True)
         except IOError:
             from sfa.server.registry import Registries
             registries = Registries(self)