valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

minor modules.dnsutil._to_seconds() cleanup

Browse Source 
rename `time` arg to avoid shadowing imported `time` module
catch more specific exception when doing conversion to int
This commit is contained in:
Chris Rebert 2014-09-19 13:08:59 -07:00
parent 90f52918fa
commit b39b576f50
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
salt/modules/dnsutil.py
View File

@ -187,28 +187,28 @@ def parse_zone(zonefile=None, zone=None):
return zonedict
def _to_seconds(time):
def _to_seconds(timestr):
'''
Converts a time value to seconds.
As per RFC1035 (page 45), max time is 1 week, so anything longer (or
unreadable) will be set to one week (604800 seconds).
'''
time = time.upper()
if 'H' in time:
time = int(time.replace('H', '')) * 3600
elif 'D' in time:
time = int(time.replace('D', '')) * 86400
elif 'W' in time:
time = 604800
timestr = timestr.upper()
if 'H' in timestr:
seconds = int(timestr.replace('H', '')) * 3600
elif 'D' in timestr:
seconds = int(timestr.replace('D', '')) * 86400
elif 'W' in timestr:
seconds = 604800
else:
try:
time = int(time)
except Exception:
time = 604800
if time > 604800:
time = 604800
return time
seconds = int(timestr)
except ValueError:
seconds = 604800
if seconds > 604800:
seconds = 604800
return seconds
def _has_dig():