spec/timetable_spec: Fix order of arguments to assert.same

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

diff --git a/luatz/parse.lua b/luatz/parse.lua
index 0b3b2ddcb0b488fdc84be8078b9759334b505c92..0bfd820fb477b56def6838be54ab072d1ffcc1a7 100644 (file)
--- a/luatz/parse.lua
+++ b/luatz/parse.lua
@@ -8,7 +8,7 @@ local new_timetable = require "luatz.timetable".new
 local function rfc_3339 ( str , init )
        local year , month , day , hour , min , sec , patt_end = str:match ( "^(%d%d%d%d)%-(%d%d)%-(%d%d)[Tt](%d%d%.?%d*):(%d%d):(%d%d)()" , init )
        if not year then
 local function rfc_3339 ( str , init )
        local year , month , day , hour , min , sec , patt_end = str:match ( "^(%d%d%d%d)%-(%d%d)%-(%d%d)[Tt](%d%d%.?%d*):(%d%d):(%d%d)()" , init )
        if not year then

-               error ( "Invalid RFC 3339 timestamp" )
+               return nil, "Invalid RFC 3339 timestamp"

        end
        year  = tonumber ( year )
        month = tonumber ( month )
        end
        year  = tonumber ( year )
        month = tonumber ( month )


@@ -26,7 +26,7 @@ local function rfc_3339 ( str , init )
                local hour_offset , min_offset = str:match ( "^([+-]%d%d):(%d%d)" , patt_end )
                if hour_offset then
                        tz_offset = tonumber ( hour_offset ) * 3600 + tonumber ( min_offset ) * 60
                local hour_offset , min_offset = str:match ( "^([+-]%d%d):(%d%d)" , patt_end )
                if hour_offset then
                        tz_offset = tonumber ( hour_offset ) * 3600 + tonumber ( min_offset ) * 60

-               else
+               else -- luacheck: ignore 542

                        -- Invalid RFC 3339 timestamp offset (should be Z or (+/-)hour:min)
                        -- tz_offset will be nil
                end
                        -- Invalid RFC 3339 timestamp offset (should be Z or (+/-)hour:min)
                        -- tz_offset will be nil
                end