Merge pull request #3176 from jpmens/sol-epoch

setup epoch time doesn't have tics on Python 2.6.4 (Solaris).
reviewable/pr18780/r1
Michael DeHaan 12 years ago
commit 9017919f16

@ -365,6 +365,8 @@ class Facts(object):
self.facts['date_time']['minute'] = now.strftime('%M') self.facts['date_time']['minute'] = now.strftime('%M')
self.facts['date_time']['second'] = now.strftime('%S') self.facts['date_time']['second'] = now.strftime('%S')
self.facts['date_time']['epoch'] = now.strftime('%s') self.facts['date_time']['epoch'] = now.strftime('%s')
if self.facts['date_time']['epoch'][0] == '%':
self.facts['date_time']['epoch'] = str(int(time.time()))
self.facts['date_time']['date'] = now.strftime('%Y-%m-%d') self.facts['date_time']['date'] = now.strftime('%Y-%m-%d')
self.facts['date_time']['time'] = now.strftime('%H:%M:%S') self.facts['date_time']['time'] = now.strftime('%H:%M:%S')
self.facts['date_time']['iso8601_micro'] = now.utcnow().strftime("%Y-%m-%dT%H:%M:%S.%fZ") self.facts['date_time']['iso8601_micro'] = now.utcnow().strftime("%Y-%m-%dT%H:%M:%S.%fZ")

Loading…
Cancel
Save