remove timezone info from credential's expires timestamp
authorTony Mack <tmack@paris.CS.Princeton.EDU>
Thu, 30 Jun 2011 22:47:31 +0000 (18:47 -0400)
committerTony Mack <tmack@paris.CS.Princeton.EDU>
Thu, 30 Jun 2011 22:47:31 +0000 (18:47 -0400)
sfa/managers/aggregate_manager_pl.py

index 78aebb9..d33a002 100644 (file)
@@ -79,7 +79,7 @@ def __get_registry_objects(slice_xrn, creds, users):
 
         slice = {}
         
-        extime = Credential(string=creds[0]).get_expiration()
+        extime = Credential(string=creds[0]).get_expiration().replace(tzinfo=None)
         # If the expiration time is > 60 days from now, set the expiration time to 60 days from now
         if extime > datetime.datetime.utcnow() + datetime.timedelta(days=60):
             extime = datetime.datetime.utcnow() + datetime.timedelta(days=60)