merged namespace

[sfa.git] / sfa / methods / GetCredential.py

diff --git a/sfa/methods/GetCredential.py b/sfa/methods/GetCredential.py
index eb535ed..9bd5cd1 100644 (file)
--- a/sfa/methods/GetCredential.py
+++ b/sfa/methods/GetCredential.py
@@ -1,19 +1,16 @@
-### $Id: get_credential.py 17576 2010-04-05 20:56:15Z tmack $
-### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/get_credential.py $
-
+#
 from sfa.trust.credential import *
 from sfa.trust.rights import *
 from sfa.util.faults import *
 from sfa.util.namespace import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.debug import log
 from sfa.trust.credential import Credential
 
 class GetCredential(Method):
     """
     Retrive a credential for an object
-    If cred == Nonee then the behavior reverts to get_self_credential
+    If cred == None then the behavior reverts to GetSelfCredential
 
     @param hrn human readable name of object (hrn or urn)
     @param cred credential object specifying rights of the caller
@@ -28,7 +25,8 @@ class GetCredential(Method):
         Mixed(Parameter(str, "Credential string"),
               Parameter(type([str]), "List of credentials")), 
         Parameter(str, "Human readable name (hrn or urn)"),
-        Parameter(str, "Object type")
+        Mixed(Parameter(str, "Record type"),
+              Parameter(None, "Type not specified")),
         ]
 
     returns = Parameter(str, "String representation of a credential object")