Merge branch 'master' into senslab2

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

diff --git a/sfa/methods/GetTicket.py b/sfa/methods/GetTicket.py
index b1d8f87..54978e7 100644 (file)
--- a/sfa/methods/GetTicket.py
+++ b/sfa/methods/GetTicket.py
@@ -1,10 +1,11 @@
 from sfa.util.xrn import urn_to_hrn
 from sfa.util.method import Method
-from sfa.util.parameter import Parameter, Mixed
 from sfa.util.sfatablesRuntime import run_sfatables
 
 from sfa.trust.credential import Credential
 
+from sfa.storage.parameter import Parameter, Mixed
+
 class GetTicket(Method):
     """
     Retrieve a ticket. This operation is currently implemented on PLC
@@ -35,7 +36,7 @@ class GetTicket(Method):
 
     returns = Parameter(str, "String representation of a ticket object")
     
-    def call(self, xrn, creds, rspec, users, options={}):
+    def call(self, xrn, creds, rspec, users, options):
         hrn, type = urn_to_hrn(xrn)
         # Find the valid credentials
         valid_creds = self.api.auth.checkCredentials(creds, 'getticket', hrn)