From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Hong Xu Newsgroups: gmane.emacs.bugs Subject: bug#25086: [PATCH] Fix the timezone detection of parse-iso8601-time-string. Date: Sat, 17 Dec 2016 19:11:58 -0800 Message-ID: <87d1gqlym9.fsf@topbug.net> References: <1480650408-26252-1-git-send-email-hong@topbug.net> <874m2nyog6.fsf@topbug.net> <8737i7yo27.fsf@topbug.net> <837f6y7gch.fsf@gnu.org> <87eg16z3qm.fsf@topbug.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" X-Trace: blaine.gmane.org 1482030797 11571 195.159.176.226 (18 Dec 2016 03:13:17 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 18 Dec 2016 03:13:17 +0000 (UTC) User-Agent: mu4e 0.9.18; emacs 25.1.90.7 Cc: 25086@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Dec 18 04:13:12 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cIRuP-0001ZY-3W for geb-bug-gnu-emacs@m.gmane.org; Sun, 18 Dec 2016 04:13:09 +0100 Original-Received: from localhost ([::1]:39009 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cIRuS-0004yl-V1 for geb-bug-gnu-emacs@m.gmane.org; Sat, 17 Dec 2016 22:13:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cIRuL-0004xd-Hw for bug-gnu-emacs@gnu.org; Sat, 17 Dec 2016 22:13:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cIRuI-0006vt-AA for bug-gnu-emacs@gnu.org; Sat, 17 Dec 2016 22:13:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:58161) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cIRuI-0006vc-7R for bug-gnu-emacs@gnu.org; Sat, 17 Dec 2016 22:13:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cIRuI-0002Pg-1C for bug-gnu-emacs@gnu.org; Sat, 17 Dec 2016 22:13:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Hong Xu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 18 Dec 2016 03:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25086 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 25086-submit@debbugs.gnu.org id=B25086.14820307309209 (code B ref 25086); Sun, 18 Dec 2016 03:13:01 +0000 Original-Received: (at 25086) by debbugs.gnu.org; 18 Dec 2016 03:12:10 +0000 Original-Received: from localhost ([127.0.0.1]:45327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cIRtS-0002OT-7r for submit@debbugs.gnu.org; Sat, 17 Dec 2016 22:12:10 -0500 Original-Received: from sender163-mail.zoho.com ([74.201.84.163]:21394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cIRtQ-0002OK-Fa for 25086@debbugs.gnu.org; Sat, 17 Dec 2016 22:12:09 -0500 Original-Received: from localhost (cpe-104-32-170-214.socal.res.rr.com [104.32.170.214]) by mx.zohomail.com with SMTPS id 1482030723102152.26069087372434; Sat, 17 Dec 2016 19:12:03 -0800 (PST) In-reply-to: <87eg16z3qm.fsf@topbug.net> X-Zoho-Virus-Status: 1 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:127118 Archived-At: --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain On 2016-12-17 Sat 12:42 GMT-0800, Hong Xu wrote: > > I've added the tests now. And indeed, it exposes a bug in the original patch. > > Again, I decomposed the patch to two different parts, one for the stable > branch and the other (with only test files) for the master branch. > Attached is a newer version which has fixed a few edge cases. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Fix-the-timezone-detection-of-parse-iso8601-time-str.patch Content-Transfer-Encoding: quoted-printable From=20a7050f2785a74c6669dae556fa9a1deae84081a8 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Sat, 17 Dec 2016 12:07:45 -0800 Subject: [PATCH] Fix the timezone detection of parse-iso8601-time-string. * parse-time.el (parse-iso8601-time-string): Fix its timezone parsing and make it autoload. * parse-time.el: Add doc for parse-iso8601-time-string. * editfns.c (Fdecode-time): Minor doc improvement for decode-time. * emacs-mime.texi (time-date): Add an example for parse-iso8601-time-string. =2D-- doc/misc/emacs-mime.texi | 3 +++ lisp/calendar/parse-time.el | 27 ++++++++++++++++++++------- src/editfns.c | 5 ++--- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi index 4d68246bba4b..8d6536265416 100644 =2D-- a/doc/misc/emacs-mime.texi +++ b/doc/misc/emacs-mime.texi @@ -1536,6 +1536,9 @@ time-date (date-to-time "Sat Sep 12 12:21:54 1998 +0200") @result{} (13818 19266) =20 +(parse-iso8601-time-string "1998-09-12T12:21:54+0200") +@result{} (13818 19266) + (float-time '(13818 19266)) @result{} 905595714.0 =20 diff --git a/lisp/calendar/parse-time.el b/lisp/calendar/parse-time.el index 6ba26a4a00d0..be1107ee3d29 100644 =2D-- a/lisp/calendar/parse-time.el +++ b/lisp/calendar/parse-time.el @@ -195,7 +195,7 @@ parse-time-iso8601-regexp (time-minute 2digit) (time-second 2digit) (time-secfrac "\\(\\.[0-9]+\\)?") =2D (time-numoffset (concat "[-+]\\(" time-hour "\\):" time-minute)) + (time-numoffset (concat "\\([-+]\\)" time-hour ":?" time-minute "?")) (time-offset (concat "Z" time-numoffset)) (partial-time (concat time-hour colon time-minute colon time-second time-secfrac)) @@ -204,19 +204,23 @@ parse-time-iso8601-regexp (date-time (concat full-date "T" full-time))) (list (concat "^" full-date) (concat "T" partial-time) =2D (concat "Z" time-numoffset))) + (concat "\\(Z\\|" time-numoffset "\\)"))) "List of regular expressions matching ISO 8601 dates. 1st regular expression matches the date. 2nd regular expression matches the time. 3rd regular expression matches the (optional) timezone specification.") =20 +;;;###autoload (defun parse-iso8601-time-string (date-string) + "Parse an ISO 8601 time string, such as 2016-12-01T23:35:06-05:00. +If DATE-STRING cannot be parsed, it falls back to +`parse-time-string'." (let* ((date-re (nth 0 parse-time-iso8601-regexp)) (time-re (nth 1 parse-time-iso8601-regexp)) (tz-re (nth 2 parse-time-iso8601-regexp)) =2D re-start =2D time seconds minute hour fractional-seconds =2D day month year day-of-week dst tz) + re-start + time seconds minute hour fractional-seconds + day month year day-of-week dst tz) ;; We need to populate 'time' with ;; (SEC MIN HOUR DAY MON YEAR DOW DST TZ) =20 @@ -235,10 +239,19 @@ parse-iso8601-time-string "0")) re-start (match-end 0)) (when (string-match tz-re date-string re-start) =2D (setq tz (match-string 1 date-string))) + (if (string=3D "Z" (match-string 1 date-string)) + (setq tz 0) ;; UTC timezone indicated by Z + (setq tz (+ + (* 3600 + (string-to-number (match-string 3 date-string))) + (* 60 + (string-to-number + (or (match-string 4 date-string) "0"))))) + (when (string=3D "-" (match-string 2 date-string)) + (setq tz (- tz))))) (setq time (list seconds minute hour day month year day-of-week dst tz)))) =20 =2D ;; Fall back to having Gnus do fancy things for us. + ;; Fall back to having `parse-time-string' do fancy things for us. (when (not time) (setq time (parse-time-string date-string))) =20 diff --git a/src/editfns.c b/src/editfns.c index 5cc4a67ab19b..2f1f412d9e4e 100644 =2D-- a/src/editfns.c +++ b/src/editfns.c @@ -2101,9 +2101,8 @@ format_time_string (char const *format, ptrdiff_t for= matlen, =20 DEFUN ("decode-time", Fdecode_time, Sdecode_time, 0, 2, 0, doc: /* Decode a time value as (SEC MINUTE HOUR DAY MONTH YEAR DOW = DST UTCOFF). =2DThe optional SPECIFIED-TIME should be a list of (HIGH LOW . IGNORED), =2Das from `current-time' and `file-attributes', or nil to use the =2Dcurrent time. +The optional TIME should be a list of (HIGH LOW . IGNORED), as from +`current-time' and `file-attributes', or nil to use the current time. It can also be a single integer number of seconds since the epoch. The obsolete form (HIGH . LOW) is also still accepted. The optional ZONE is omitted or nil for Emacs local time, t for =2D-=20 2.1.4 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Add-tests-for-parse-iso8601-time-string.patch Content-Transfer-Encoding: quoted-printable From=20f53bed4fa277af83c5194854c092687a1002d709 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Sat, 17 Dec 2016 12:38:26 -0800 Subject: [PATCH] Add tests for parse-iso8601-time-string. * parse-time-tests.el (parse-time-tests): Add tests for parse-iso8601-time-string. =2D-- test/lisp/calendar/parse-time-tests.el | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/test/lisp/calendar/parse-time-tests.el b/test/lisp/calendar/pa= rse-time-tests.el index 9bcf2b4a53c7..6dc23372f249 100644 =2D-- a/test/lisp/calendar/parse-time-tests.el +++ b/test/lisp/calendar/parse-time-tests.el @@ -42,7 +42,23 @@ (should (equal (parse-time-string "Monday, 22 february 2016 19:35:42 +01= 00") '(42 35 19 22 2 2016 1 nil 3600))) (should (equal (parse-time-string "Monday, 22 february 2016 19:35:42 PDT= ") =2D '(42 35 19 22 2 2016 1 t -25200)))) + '(42 35 19 22 2 2016 1 t -25200))) + (should (equal (parse-iso8601-time-string "1998-09-12T12:21:54-0200") + '(13818 33666))) + (should (equal (parse-iso8601-time-string "1998-09-12T12:21:54-0230") + '(13818 35466))) + (should (equal (parse-iso8601-time-string "1998-09-12T12:21:54-02:00") + '(13818 33666))) + (should (equal (parse-iso8601-time-string "1998-09-12T12:21:54-02") + '(13818 33666))) + (should (equal (parse-iso8601-time-string "1998-09-12T12:21:54+0230") + '(13818 17466))) + (should (equal (parse-iso8601-time-string "1998-09-12T12:21:54+02") + '(13818 19266))) + (should (equal (parse-iso8601-time-string "1998-09-12T12:21:54Z") + '(13818 26466))) + (should (equal (parse-iso8601-time-string "1998-09-12T12:21:54") + (encode-time 54 21 12 12 9 1998)))) =20 (provide 'parse-time-tests) =20 =2D-=20 2.1.4 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJYVf5+AAoJECZsfTOCL4R4HF0P/1K/LSe5ztoT8MaOeONaauPj r5l9lqTrU3Ouou/5JBXmp9HB+GN8nQgUaDPJDoPm5oso/beZKll1zwolN8vY1Eog QXOuM2dOVR4TAF4V+SAP2+H1UmUZwqUF0rpQHqCA0sdCU3YRZKAkPCj8UqjJVyJC 8fxbs+2UDA576fhmMGbKTOwbONxqzuIqhDhmHrv3OMkTkkWm2JhfncchuJ8aZhw0 +ZBGX7wYb8MBwxHwejJ+Bep3JR/tKa/pq7k3nnH9BTPobKT+d7ptUpktVfPcmaNb YeDju2nhOp6DYdBMfpukr4HQfkbrNhsHkYA3P7dgrAJ0N51TVYvEuedS90+H1A6d dNucQfUkfXB1t/nZQv8mshaWWILqZHO2KvP/NZi/DulLNiScILzFRh8/gWgQ8+w/ MIbnp+EShVAwtP8VWwXdh1KNnpIBzc/eTi2A3J0DkPmHQ2cjTAMucC/JKiFmnnhy 20eue1NtXN3SCkfHEEkBtC2QbvQHXA5RQyMpFZnJErJ1z5uBhH1xhTM81xG7TJ4F a1KT53+2U5ECpnmdShadnP3gTyQxigXuUh1Mtk8cbEMtWdLv6gvcrKRLgYjBNVAK VzhiDOhpXSTshYLez/2A6DZ73MlQltUgqe8I0q/smRpKtx7cypFjdNjvYeepYcEO K/o+l/9LizqWy4qx6Uap =+4DV -----END PGP SIGNATURE----- --==-=-=--