Rooba
/
cowrie
mirror of https://github.com/cowrie/cowrie.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated formatting

This commit is contained in:
Michel Oosterhof 2016-07-11 18:57:09 +04:00
parent 456fab8835
commit 0816f0bbe0
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cowrie/core/utils.py
View File

@ -8,6 +8,7 @@ This module contains ...
def durationHuman(seconds): def durationHuman(seconds):
""" """
Turn number of seconds into human readable string
""" """
seconds = long(round(seconds)) seconds = long(round(seconds))
minutes, seconds = divmod(seconds, 60) minutes, seconds = divmod(seconds, 60)
@ -23,16 +24,16 @@ def durationHuman(seconds):
duration = [] duration = []
if years > 0: if years > 0:
duration.append('%s year' % syears + 's'*(years != 1) + ' ') duration.append('{} year'.format(syears) + 's'*(years != 1) + ' ')
else: else:
if days > 0: if days > 0:
duration.append('%s day' % sdays + 's'*(days != 1) + ' ') duration.append('{} day'.format(days) + 's'*(days != 1) + ' ')
if hours > 0: if hours > 0:
duration.append('%s:' % shours) duration.append('{}:'.format(shours))
if minutes >= 0: if minutes >= 0:
duration.append('%s:' % sminutes) duration.append('{}:'.format(sminutes))
if seconds >= 0: if seconds >= 0:
duration.append('%s' % sseconds) duration.append('{}'.format(sseconds))
return ''.join(duration) return ''.join(duration)
@ -85,6 +86,6 @@ def uptime(total_seconds):
if len(s) > 0 or hours > 0: if len(s) > 0 or hours > 0:
s += '%s:%s' % (str(hours).rjust(2), str(minutes).rjust(2, '0')) s += '%s:%s' % (str(hours).rjust(2), str(minutes).rjust(2, '0'))
else: else:
s += '%s min' % (str(minutes)) s += '{} min'.format(str(minutes))
return s return s