jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed timezone offset parsing

Browse source
This commit is contained in:
Felix Krause 2016-11-01 19:33:43 +01:00
commit c1f0b7643c
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/pure/times.nim
View file

@ -1127,31 +1127,33 @@ proc parseToken(info: var TimeInfo; token, value: string; j: var int) =
j += 4 j += 4
of "z": of "z":
if value[j] == '+': if value[j] == '+':
info.timezone = parseInt($value[j+1]) info.timezone = 0-parseInt($value[j+1]) * 3600
elif value[j] == '-': elif value[j] == '-':
info.timezone = 0-parseInt($value[j+1]) info.timezone = parseInt($value[j+1]) * 3600
else: else:
raise newException(ValueError, raise newException(ValueError,
"Couldn't parse timezone offset (z), got: " & value[j]) "Couldn't parse timezone offset (z), got: " & value[j])
j += 2 j += 2
of "zz": of "zz":
if value[j] == '+': if value[j] == '+':
info.timezone = value[j+1..j+2].parseInt() info.timezone = 0-value[j+1..j+2].parseInt() * 3600
elif value[j] == '-': elif value[j] == '-':
info.timezone = 0-value[j+1..j+2].parseInt() info.timezone = value[j+1..j+2].parseInt() * 3600
else: else:
raise newException(ValueError, raise newException(ValueError,
"Couldn't parse timezone offset (zz), got: " & value[j]) "Couldn't parse timezone offset (zz), got: " & value[j])
j += 3 j += 3
of "zzz": of "zzz":
if value[j] == '+': var factor = 0
info.timezone = value[j+1..j+2].parseInt() if value[j] == '+': factor = -1
elif value[j] == '-': elif value[j] == '-': factor = 1
info.timezone = 0-value[j+1..j+2].parseInt()
else: else:
raise newException(ValueError, raise newException(ValueError,
"Couldn't parse timezone offset (zzz), got: " & value[j]) "Couldn't parse timezone offset (zzz), got: " & value[j])
j += 6 info.timezone = factor * value[j+1..j+2].parseInt() * 3600
j += 4
info.timezone += factor * value[j..j+1].parseInt() * 60
j += 2
of "ZZZ": of "ZZZ":
info.tzname = value[j..j+2].toUpperAscii() info.tzname = value[j..j+2].toUpperAscii()
j += 3 j += 3
@ -1188,7 +1190,7 @@ proc parse*(value, layout: string): TimeInfo =
## yyyy Displays the year to four digits. ``2012 -> 2012`` ## yyyy Displays the year to four digits. ``2012 -> 2012``
## z Displays the timezone offset from UTC. ``GMT+7 -> +7``, ``GMT-5 -> -5`` ## z Displays the timezone offset from UTC. ``GMT+7 -> +7``, ``GMT-5 -> -5``
## zz Same as above but with leading 0. ``GMT+7 -> +07``, ``GMT-5 -> -05`` ## zz Same as above but with leading 0. ``GMT+7 -> +07``, ``GMT-5 -> -05``
## zzz Same as above but with ``:00``. ``GMT+7 -> +07:00``, ``GMT-5 -> -05:00`` ## zzz Same as above but with ``:mm`` where *mm* represents minutes. ``GMT+7 -> +07:00``, ``GMT-5 -> -05:00``
## ZZZ Displays the name of the timezone. ``GMT -> GMT``, ``EST -> EST`` ## ZZZ Displays the name of the timezone. ``GMT -> GMT``, ``EST -> EST``
## ========== ================================================================================= ================================================ ## ========== ================================================================================= ================================================
## ##