Merge branch 'master' into senslab2

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

diff --git a/sfa/methods/DeleteSliver.py b/sfa/methods/DeleteSliver.py
index fe07b6a..697b6d3 100644 (file)
--- a/sfa/methods/DeleteSliver.py
+++ b/sfa/methods/DeleteSliver.py
@@ -1,6 +1,6 @@
 from sfa.util.xrn import urn_to_hrn
 from sfa.util.method import Method
-from sfa.util.parameter import Parameter, Mixed
+from sfa.storage.parameter import Parameter, Mixed
 from sfa.trust.auth import Auth
 from sfa.trust.credential import Credential
 
@@ -24,7 +24,7 @@ class DeleteSliver(Method):
 
     returns = Parameter(int, "1 if successful")
     
-    def call(self, xrn, creds, options={}):
+    def call(self, xrn, creds, options):
         (hrn, type) = urn_to_hrn(xrn)
         valid_creds = self.api.auth.checkCredentials(creds, 'deletesliver', hrn)