Time2Internaldate(): Call isinstance() once for each of the type tests
instead of possibly twice by using a sequence of types to check for. Add a message to the ValueError that can be raised.
This commit is contained in:
parent
1e2fb57b5f
commit
db519205a2
|
@ -1069,14 +1069,14 @@ def Time2Internaldate(date_time):
|
||||||
Return string in form: '"DD-Mmm-YYYY HH:MM:SS +HHMM"'
|
Return string in form: '"DD-Mmm-YYYY HH:MM:SS +HHMM"'
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if isinstance(date_time, int) or isinstance(date_time, float):
|
if isinstance(date_time, (int, float)):
|
||||||
tt = time.localtime(date_time)
|
tt = time.localtime(date_time)
|
||||||
elif isinstance(date_time, tuple) or \
|
elif isinstance(date_time, (tuple, time.struct_time)):
|
||||||
isinstance(date_time, time.struct_time):
|
|
||||||
tt = date_time
|
tt = date_time
|
||||||
elif isinstance(date_time, str):
|
elif isinstance(date_time, str):
|
||||||
return date_time # Assume in correct format
|
return date_time # Assume in correct format
|
||||||
else: raise ValueError
|
else:
|
||||||
|
raise ValueError("date_time not of a known type")
|
||||||
|
|
||||||
dt = time.strftime("%d-%b-%Y %H:%M:%S", tt)
|
dt = time.strftime("%d-%b-%Y %H:%M:%S", tt)
|
||||||
if dt[0] == '0':
|
if dt[0] == '0':
|
||||||
|
|
Loading…
Reference in New Issue