deeper pass on xmlrpclib vs xmlrpc.client as well as configparser
[sfa.git] / sfa / managers / component_manager_pl.py
index 9630479..ba9b7eb 100644 (file)
@@ -1,9 +1,10 @@
-import xmlrpclib
-
 from sfa.util.faults import SliverDoesNotExist
-from sfa.util.plxrn import PlXrn
-from sfa.trust.sfaticket import SfaTicket
 from sfa.util.version import version_core
+from sfa.util.py23 import xmlrpc_client
+
+from sfa.trust.sfaticket import SfaTicket
+
+from sfa.planetlab.plxrn import PlXrn
 
 def GetVersion(api, options):
     return version_core({'interface':'component',
@@ -64,7 +65,7 @@ def redeem_ticket(api, ticket_string):
         raise SliverDoesNotExist(slicename)
 
     # convert ticket to format nm is used to
-    nm_ticket = xmlrpclib.dumps((ticket.attributes,), methodresponse=True)
+    nm_ticket = xmlrpc_client.dumps((ticket.attributes,), methodresponse=True)
     api.driver.nodemanager.AdminTicket(nm_ticket)