X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Frspec.py;h=8a66ff35fa93fe895407b2ea74617293ab734307;hb=d748c93a11a23b22d9e310db3c58c2bfb18b38fb;hp=a17b7d673e7f4fdb0bb4f220da63c81b04bdeda1;hpb=3ae1605fb3d0594364b684b595eb21a81717d9ad;p=sfa.git diff --git a/sfa/rspecs/rspec.py b/sfa/rspecs/rspec.py index a17b7d67..8a66ff35 100755 --- a/sfa/rspecs/rspec.py +++ b/sfa/rspecs/rspec.py @@ -3,6 +3,7 @@ from datetime import datetime, timedelta from sfa.util.xml import XML, XpathFilter from sfa.util.faults import InvalidRSpecElement, InvalidRSpec +from sfa.util.sfatime import SFATIME_FORMAT from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements from sfa.rspecs.version_manager import VersionManager @@ -35,11 +36,9 @@ class RSpec: self.version = self.version_manager.get_version(version) self.namespaces = self.version.namespaces self.parse_xml(self.version.template, self.version) - # eg. 2011-03-23T19:53:28Z - date_format = '%Y-%m-%dT%H:%M:%SZ' now = datetime.utcnow() - generated_ts = now.strftime(date_format) - expires_ts = (now + timedelta(hours=1)).strftime(date_format) + generated_ts = now.strftime(SFATIME_FORMAT) + expires_ts = (now + timedelta(hours=1)).strftime(SFATIME_FORMAT) self.xml.set('expires', expires_ts) self.xml.set('generated', generated_ts)