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: Thu, 01 Dec 2016 20:04:00 -0800 Message-ID: <8737i7yo27.fsf@topbug.net> References: <1480650408-26252-1-git-send-email-hong@topbug.net> <874m2nyog6.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 1480651517 17912 195.159.176.226 (2 Dec 2016 04:05:17 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 2 Dec 2016 04:05:17 +0000 (UTC) User-Agent: mu4e 0.9.17; emacs 25.1.90.4 To: 25086@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Dec 02 05:05: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 1cCf5z-0003gC-Gb for geb-bug-gnu-emacs@m.gmane.org; Fri, 02 Dec 2016 05:05:11 +0100 Original-Received: from localhost ([::1]:60474 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCf61-0005T7-Or for geb-bug-gnu-emacs@m.gmane.org; Thu, 01 Dec 2016 23:05:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCf5v-0005Qi-7I for bug-gnu-emacs@gnu.org; Thu, 01 Dec 2016 23:05:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCf5q-00081v-UJ for bug-gnu-emacs@gnu.org; Thu, 01 Dec 2016 23:05:07 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:33927) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cCf5q-00081p-Qe for bug-gnu-emacs@gnu.org; Thu, 01 Dec 2016 23:05:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cCf5q-0006uY-G9 for bug-gnu-emacs@gnu.org; Thu, 01 Dec 2016 23:05: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: Fri, 02 Dec 2016 04:05:02 +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 X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.148065145926505 (code B ref -1); Fri, 02 Dec 2016 04:05:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 2 Dec 2016 04:04:19 +0000 Original-Received: from localhost ([127.0.0.1]:49326 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cCf59-0006tR-52 for submit@debbugs.gnu.org; Thu, 01 Dec 2016 23:04:19 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:60124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cCf57-0006tC-BJ for submit@debbugs.gnu.org; Thu, 01 Dec 2016 23:04:17 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCf50-0007S7-Pj for submit@debbugs.gnu.org; Thu, 01 Dec 2016 23:04:12 -0500 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:34674) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cCf50-0007Rt-N3 for submit@debbugs.gnu.org; Thu, 01 Dec 2016 23:04:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51083) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCf4z-0005Gf-74 for bug-gnu-emacs@gnu.org; Thu, 01 Dec 2016 23:04:10 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCf4v-0007Pc-7L for bug-gnu-emacs@gnu.org; Thu, 01 Dec 2016 23:04:09 -0500 Original-Received: from sender163-mail.zoho.com ([74.201.84.163]:21402) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cCf4u-0007P1-SI for bug-gnu-emacs@gnu.org; Thu, 01 Dec 2016 23:04:05 -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 148065144150068.11165459871756; Thu, 1 Dec 2016 20:04:01 -0800 (PST) In-reply-to: <874m2nyog6.fsf@topbug.net> X-Zoho-Virus-Status: 1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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:126384 Archived-At: --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain On 2016-12-01 Thu 19:55 GMT-0800, Hong Xu wrote: > On 2016-12-01 Thu 19:46 GMT-0800, Hong Xu wrote: > >> * parse-time.el (parse-iso8601-time-string): Fix its timezone >> parsing. >> * parse-time.el: Add doc for parse-iso8601-time-string and >> make it autoload. >> * editfns.c (Fdecode-time): Minor doc improvement for decode-time. > > I should have noted that the current version basically cannot parse the > timezone at all. To reproduce, try the following: > > (format-time-string "%H %M %S" > (parse-iso8601-time-string "1998-09-12T12:21:54-0200") t) > > > Also missed one line: > > * emacs-mime.texi (time-date): Add an example for parse-iso8601-time-string. I've now updated the patch and put everything together, as attached. --=-=-= 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 [PATCH] Fix the timezone detection of parse-iso8601-time-string. * parse-time.el (parse-iso8601-time-string): Fix its timezone parsing. * parse-time.el: Add doc for parse-iso8601-time-string and make it autoload. * 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 | 12 ++++++++---- src/editfns.c | 5 ++--- 3 files changed, 13 insertions(+), 7 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..e9dac0149b10 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,13 +204,17 @@ 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)) @@ -235,10 +239,10 @@ 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))) + (setq tz (* 3600 (string-to-number (match-string 1 date-string))))) (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: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJYQPKwAAoJECZsfTOCL4R4OTYP+gPaQcy4cWXo9s6YN3NApF+u B5ydWV2U3SQgtT6DmqyrtyuyycrWeEf6uR1suX+nVwvk5eBGwiY4EdvzsnncSFJV lJiM3UznEBuf0Xn9p4jYzZGhj0rL19W5IeaUO2i2XAEYOO+Gc6xdtnxC2ACdEieI 7QZJ3WLjyFGuX1B1UuMiTrn8FpzpaykuiJdEg+FGfONE7a60ZmuA0QUkI+sUbT+a oIIE8PmIGl6iPlLt7LCyYdRoXZg+I+ueZlbvk5+Q0/2tpUqJinOCg1muOqL1MRn8 b8YA1llOpA4/b0XPV/4Xlo9OSfMLKzE1FKxI9Rc93EKGZ+f6WGZUno9rNzCgYvDO HMDi10+GG8wSU/aQHOj7ShIVwhL5tGc4nC17uxbvTetPu7doLmiOTeqQqaaTjQaw ANObkm+fSJD5CJhIOhrY99dZtn1hnwGTffsTFDQ6TklvVbHhlfFqsv4eoYUpjmwf i/borLKrSvN0k+ObYUbVIBN5ekWpq2bRZJc9d3O3u8aLO0q9Welbe1BV5nV64g0D QT5q4VNqsCPHwfxLHpCb9xMn8Q0rdb1OYFATOa8t7ORA2unr6eQN7ntccEEb3L2V b6WWc3GJ/jOKm+majfw8ol3heNZxV1xGxj6lxRkt5eG0yoXzxoZrK9QZHP07SJO4 MR7fHBj6Ipk7NJLWRJ0y =FWI5 -----END PGP SIGNATURE----- --==-=-=--