Merging some recent changes

diff --git a/sfa/util/newgeniclient.py b/sfa/util/newgeniclient.py
index b05947e..fe2935a 100644 (file)
--- a/sfa/util/newgeniclient.py
+++ b/sfa/util/newgeniclient.py
@@ -10,7 +10,7 @@
 from sfa.trust.gid import *
 from sfa.trust.credential import *
 from sfa.util.record import *
-from sfa.util.geniticket import *
+from sfa.util.sfaticket import *
 
 ##
 # The GeniClient class provides stubs for executing Geni operations. A given
@@ -318,7 +318,7 @@ class GeniClient:
 
     def get_ticket(self, cred, name, rspec):
         ticket_str = self.server.get_ticket(cred.save_to_string(save_parents=True), name, rspec)
-        ticket = Ticket(string=ticket_str)
+        ticket = SfaTicket(string=ticket_str)
         return ticket
 
     ##