remove py23 compat layer

[sfa.git] / sfa / trust / sfaticket.py

diff --git a/sfa/trust/sfaticket.py b/sfa/trust/sfaticket.py
index 6d4a009..0be88b8 100644 (file)
--- a/sfa/trust/sfaticket.py
+++ b/sfa/trust/sfaticket.py
@@ -24,12 +24,12 @@
 # implements SFA tickets
 #
 
-from __future__ import print_function
+
 
 from sfa.trust.certificate import Certificate
 from sfa.trust.gid import GID
 
-from sfa.util.py23 import xmlrpc_client
+import xmlrpc.client
 
 # Ticket is tuple:
 #   (gidCaller, gidObject, attributes, rspec, delegate)
@@ -39,6 +39,7 @@ from sfa.util.py23 import xmlrpc_client
 #    attributes = slice attributes (keys, vref, instantiation, etc)
 #    rspec = resources
 
+
 class SfaTicket(Certificate):
     gidCaller = None
     gidObject = None
@@ -96,16 +97,18 @@ class SfaTicket(Certificate):
                 "rspec": self.rspec,
                 "delegate": self.delegate}
         if self.gidCaller:
-            dict["gidCaller"] = self.gidCaller.save_to_string(save_parents=True)
+            dict["gidCaller"] = self.gidCaller.save_to_string(
+                save_parents=True)
         if self.gidObject:
-            dict["gidObject"] = self.gidObject.save_to_string(save_parents=True)
-        str = "URI:" + xmlrpc_client.dumps((dict,), allow_none=True)
+            dict["gidObject"] = self.gidObject.save_to_string(
+                save_parents=True)
+        str = "URI:" + xmlrpc.client.dumps((dict,), allow_none=True)
         self.set_data(str)
 
     def decode(self):
         data = self.get_data()
         if data:
-            dict = xmlrpc_client.loads(self.get_data()[4:])[0][0]
+            dict = xmlrpc.client.loads(self.get_data()[4:])[0][0]
         else:
             dict = {}
 
@@ -139,12 +142,12 @@ class SfaTicket(Certificate):
             gidObject.dump(8, dump_parents)
 
         print("  attributes:")
-        for attrname in self.get_attributes().keys():
+        for attrname in list(self.get_attributes().keys()):
             print("        ", attrname, self.get_attributes()[attrname])
 
         print("       rspec:")
         print("        ", self.get_rspec())
 
         if self.parent and dump_parents:
-           print("PARENT", end=' ')
-           self.parent.dump(dump_parents)
+            print("PARENT", end=' ')
+            self.parent.dump(dump_parents)