minor tweaks in version manager embedded tester

[sfa.git] / sfa / rspecs / rspec.py

diff --git a/sfa/rspecs/rspec.py b/sfa/rspecs/rspec.py
index de3d126..605df92 100755 (executable)
--- a/sfa/rspecs/rspec.py
+++ b/sfa/rspecs/rspec.py
@@ -10,7 +10,7 @@ from sfa.rspecs.version_manager import VersionManager
 
 class RSpec:
  
-    def __init__(self, rspec="", version=None, user_options=None, ttl=None):
+    def __init__(self, rspec="", version=None, user_options=None, ttl=None, expires=None):
         if user_options is None: user_options={}
         self.header = '<?xml version="1.0"?>\n'
         self.template = """<RSpec></RSpec>"""
@@ -19,6 +19,7 @@ class RSpec:
         self.version_manager = VersionManager()
         self.user_options = user_options
         self.ttl = ttl
+        self.expires = expires
         self.elements = {}
         if rspec:
             if version:
@@ -27,11 +28,11 @@ class RSpec:
             else:
                 self.parse_xml(rspec)
         elif version:
-            self.create(version, ttl)
+            self.create(version, ttl, expires)
         else:
             raise InvalidRSpec("No RSpec or version specified. Must specify a valid rspec string or a valid version") 
 
-    def create(self, version=None, ttl=None):
+    def create(self, version=None, ttl=None, expires=None):
         """
         Create root element
         ttl: time to live in minutes, this will determine the expires tag of the RSpec
@@ -43,7 +44,14 @@ class RSpec:
         generated_ts = now.strftime(SFATIME_FORMAT)
         if ttl is None:
             ttl = 60
-        expires_ts = (now + timedelta(minutes=ttl)).strftime(SFATIME_FORMAT)
+        if expires is None:
+            expires_ts = (now + timedelta(minutes=ttl)).strftime(SFATIME_FORMAT)
+        else:
+            if isinstance(expires,int):
+                expires_date = datetime.fromtimestamp(expires)
+            else:
+                expires_date = expires
+            expires_ts = expires_date.strftime(SFATIME_FORMAT)
         self.xml.set('expires', expires_ts)
         self.xml.set('generated', generated_ts)
 
@@ -53,7 +61,7 @@ class RSpec:
             if self.xml.schema:
                 self.version = self.version_manager.get_version_by_schema(self.xml.schema)
             else:
-                #raise InvalidRSpec('unknown rspec schema: %s' % schema)
+                #raise InvalidRSpec('unknown rspec schema: {}'.format(schema))
                 # TODO: Should start raising an exception once SFA defines a schema.
                 # for now we just  default to sfa 
                 self.version = self.version_manager.get_version({'type':'sfa','version': '1'})
@@ -68,12 +76,13 @@ class RSpec:
 
     def register_rspec_element(self, element_type, element_name, element_path):
         if element_type not in RSpecElements:
-            raise InvalidRSpecElement(element_type, extra="no such element type: %s. Must specify a valid RSpecElement" % element_type)
+            raise InvalidRSpecElement(element_type,
+                                      extra="no such element type: {}. Must specify a valid RSpecElement".format(element_type))
         self.elements[element_type] = RSpecElement(element_type, element_name, element_path)
 
     def get_rspec_element(self, element_type):
         if element_type not in self.elements:
-            msg = "ElementType %s not registerd for this rspec" % element_type
+            msg = "ElementType {} not registered for this rspec".format(element_type)
             raise InvalidRSpecElement(element_type, extra=msg)
         return self.elements[element_type]
 
@@ -89,8 +98,8 @@ class RSpec:
         """
         if filter is None: filter={}
         if element_type not in self.elements:
-            msg = "Unable to search for element %s in rspec, expath expression not found." % \
-                   element_type
+            msg = "Unable to search for element {} in rspec, expath expression not found."\
+                  .format(element_type)
             raise InvalidRSpecElement(element_type, extra=msg)
         rspec_element = self.get_rspec_element(element_type)
         xpath = rspec_element.path + XpathFilter.xpath(filter)