trimmed useless imports, unstarred all imports

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

diff --git a/sfa/methods/Resolve.py b/sfa/methods/Resolve.py
index 659f9de..1e1e7a4 100644 (file)
--- a/sfa/methods/Resolve.py
+++ b/sfa/methods/Resolve.py
@@ -1,9 +1,6 @@
-### $Id: resolve.py 17157 2010-02-21 04:19:34Z tmack $
-### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/resolve.py $
-import traceback
 import types
-from sfa.util.faults import *
-from sfa.util.xrn import urn_to_hrn
+
+from sfa.util.xrn import Xrn, urn_to_hrn
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
 from sfa.trust.credential import Credential
@@ -30,11 +27,11 @@ class Resolve(Method):
     returns = [SfaRecord]
     
     def call(self, xrns, creds):
+        type = None
         if not isinstance(xrns, types.ListType):
+            type = Xrn(xrns).get_type()
             xrns=[xrns]
         hrns = [urn_to_hrn(xrn)[0] for xrn in xrns]
-        #test
-        #test2
         #find valid credentials
         valid_creds = self.api.auth.checkCredentials(creds, 'resolve')
 
@@ -44,7 +41,7 @@ class Resolve(Method):
  
         # send the call to the right manager
         manager = self.api.get_interface_manager()
-        return manager.resolve(self.api, xrns)
+        return manager.resolve(self.api, xrns, type)