procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix icalendar time zone parsing

Browse source 
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
Parse time zones more correctly.
* test/lisp/calendar/icalendar-tests.el
(icalendar-tests--decode-isodatetime): Fix tests so that they work
in other time zones than Europe/Berlin (bug#51959).
This commit is contained in:
dickmao 2021-11-21 09:18:57 +01:00 • committed by Lars Ingebrigtsen
parent 2a4a32eddb
commit 867c57029c
2 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lisp/calendar/icalendar.el
View file

@ -644,13 +644,13 @@ FIXME: multiple comma-separated values should be allowed!"
;; seconds present
(setq second (read (substring isodatetimestring 13 15))))
;; FIXME: Support subseconds.
(when (and (> (length isodatetimestring) 15)
;; UTC specifier present
(char-equal ?Z (aref isodatetimestring 15)))
(setq source-zone t
;; decode to local time unless result-zone is explicitly given,
;; i.e. do not decode to UTC, i.e. do not (setq result-zone t)
))
(when (> (length isodatetimestring) 15)
(cl-case (aref isodatetimestring 15)
(?Z
(setq source-zone t))
((?- ?+)
(setq source-zone
(concat "UTC" (substring isodatetimestring 15))))))
;; shift if necessary
(if day-shift
(let ((mdy (calendar-gregorian-from-absolute

34
test/lisp/calendar/icalendar-tests.el
View file

@ -1635,26 +1635,30 @@ SUMMARY:NNN Wwwwwwww Wwwww - Aaaaaa Pppppppp rrrrrr ddd oo Nnnnnnnn 30
(ert-deftest icalendar-tests--decode-isodatetime ()
"Test `icalendar--decode-isodatetime'."
(should (equal (icalendar-test--format "20040917T050910-0200")
"2004-09-17T03:09:10+0000"))
(should (equal (icalendar-test--format "20040917T050910")
(should (equal (icalendar-test--format "20040917T050910-02:00")
"2004-09-17T03:09:10+0000"))
(let ((orig (icalendar-test--format "20040917T050910")))
(unwind-protect
(progn
(set-time-zone-rule "UTC-02:00")
(should (equal (icalendar-test--format "20040917T050910")
"2004-09-17T03:09:10+0000"))
(should (equal (icalendar-test--format "20040917T0509")
"2004-09-17T03:09:00+0000"))
(should (equal (icalendar-test--format "20040917")
"2004-09-16T22:00:00+0000"))
(should (equal (icalendar-test--format "20040917T050910" 1)
"2004-09-18T03:09:10+0000"))
(should (equal (icalendar-test--format "20040917T050910" 30)
"2004-10-17T03:09:10+0000")))
(set-time-zone-rule 'wall) ;; (set-time-zone-rule nil) is broken
(should (equal orig (icalendar-test--format "20040917T050910")))))
(should (equal (icalendar-test--format "20040917T050910Z")
"2004-09-17T05:09:10+0000"))
(should (equal (icalendar-test--format "20040917T0509")
"2004-09-17T03:09:00+0000"))
(should (equal (icalendar-test--format "20040917")
"2004-09-16T22:00:00+0000"))
(should (equal (icalendar-test--format "20040917T050910" 1)
"2004-09-18T03:09:10+0000"))
(should (equal (icalendar-test--format "20040917T050910" 30)
"2004-10-17T03:09:10+0000"))
(should (equal (icalendar-test--format "20040917T050910" -1)
"2004-09-16T03:09:10+0000"))
(should (equal (icalendar-test--format "20040917T050910" -1 0)
"2004-09-16T05:09:10+0000"))
(should (equal (icalendar-test--format "20040917T050910" nil -3600)
"2004-09-17T06:09:10+0000")))
(provide 'icalendar-tests)
;;; icalendar-tests.el ends here