From d040c69a585f2a05385a81b5a3d34d80bc7118fa Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 4 Aug 2006 05:02:54 +0000 Subject: [PATCH] * lib/date/format.rb (__strptime, strftime): allow multi-line patterns in Date#strftime the same as Time#strftime accepts. fixed: [ruby-core:08466] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10662 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/date/format.rb | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26f05d17d7..921f8efef9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Aug 4 14:02:14 2006 + + * lib/date/format.rb (__strptime, strftime): allow multi-line patterns + in Date#strftime the same as Time#strftime accepts. + fixed: [ruby-core:08466] + Fri Aug 4 13:56:51 2006 Nobuyoshi Nakada * pack.c (pack_pack): check argument overrun for 'P'. based on a diff --git a/lib/date/format.rb b/lib/date/format.rb index babcffbfc5..52eecaf2a2 100644 --- a/lib/date/format.rb +++ b/lib/date/format.rb @@ -51,7 +51,7 @@ class Date } def self.__strptime(str, fmt, elem) - fmt.scan(/%[EO]?.|./o) do |c| + fmt.scan(/%[EO]?.|./mo) do |c| cc = c.sub(/\A%[EO]?(.)\Z/o, '%\\1') case cc when /\A\s/o @@ -490,7 +490,7 @@ class Date def strftime(fmt='%F') o = '' - fmt.scan(/%[EO]?.|./o) do |c| + fmt.scan(/%[EO]?.|./mo) do |c| cc = c.sub(/^%[EO]?(.)$/o, '%\\1') case cc when '%A'; o << DAYNAMES[wday]