luatz/tzfile: Use string.unpack when available (Lua 5.3+)

[etc/awesome.git] / luatz / timetable.lua

diff --git a/luatz/timetable.lua b/luatz/timetable.lua
index 3e802428310822aae1162df923aede765174f094..7058d7f5cfbac828f0a5fd4f3d776d3309446e94 100644 (file)
--- a/luatz/timetable.lua
+++ b/luatz/timetable.lua
@@ -171,8 +171,9 @@ function timetable_methods:timestamp ( )
 end
 
 function timetable_methods:rfc_3339 ( )
-       -- %06.3f gives 3 (=6-3) digits after decimal
-       return strformat ( "%04u-%02u-%02uT%02u:%02u:%06.3f" , self:unpack ( ) )
+       local year , month , day , hour , min , sec = self:unpack ( )
+       local sec , msec = borrow ( sec , 0 , 1000 )
+       return strformat ( "%04u-%02u-%02uT%02u:%02u:%02d.%03d" , year , month , day , hour , min , sec , msec )
 end
 
 function timetable_methods:strftime ( format_string )
@@ -227,7 +228,7 @@ local function new_from_timestamp ( ts )
        if type ( ts ) ~= "number" then
                error ( "bad argument #1 to 'new_from_timestamp' (number expected, got " .. type ( ts ) .. ")" , 2 )
        end
-       return new_timetable ( 1970 , 1 , 1 , 0 , 0 , ts )
+       return new_timetable ( 1970 , 1 , 1 , 0 , 0 , ts ):normalise ( )
 end
 
 return {