diff options
| author | tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-11 14:14:41 +0000 |
|---|---|---|
| committer | tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-11 14:14:41 +0000 |
| commit | 8e6a754b5db75eda8be13a4b08c998d4f36551cd (patch) | |
| tree | dfad441a5496e6c6bbe14417aa8fc6cd6ca8e276 | |
| parent | 3aabcaa3dab84018b9dfd7edf7ad5c48f007e6f3 (diff) | |
| download | ruby-8e6a754b5db75eda8be13a4b08c998d4f36551cd.tar.gz | |
* lib/date.rb (complete_frags): Monday must be suitable for %W's
default day.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/date.rb | 4 | ||||
| -rw-r--r-- | test/date/test_date_strptime.rb | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Tue Aug 11 23:12:31 2009 Tadayoshi Funaba <tadf@dotrb.org> + + * lib/date.rb (complete_frags): Monday must be suitable for %W's + default day. + Tue Aug 11 21:42:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * numeric.c (num_divmod): fixed rdoc. [ruby-core:24862] diff --git a/lib/date.rb b/lib/date.rb index ce1d327127..f3edb5374b 100644 --- a/lib/date.rb +++ b/lib/date.rb @@ -1,7 +1,7 @@ # # date.rb - date and time library # -# Author: Tadayoshi Funaba 1998-2008 +# Author: Tadayoshi Funaba 1998-2009 # # Documentation: William Webber <william@williamwebber.com> # @@ -927,7 +927,7 @@ class Date elem[e] = d.__send__(e) end elem[:wnum1] ||= 0 - elem[:wday] ||= 0 + elem[:wday] ||= 1 end end diff --git a/test/date/test_date_strptime.rb b/test/date/test_date_strptime.rb index 572d1ea42a..d9904939e9 100644 --- a/test/date/test_date_strptime.rb +++ b/test/date/test_date_strptime.rb @@ -442,7 +442,7 @@ class TestDateStrptime < Test::Unit::TestCase assert_equal([n.year, 11, 6, 0, 0, 0], [d.year, d.strftime('%W').to_i, d.wday, d.hour, d.min, d.sec]) d = DateTime.strptime('2004-11', '%Y-%W') - assert_equal([2004, 11, 0, 0, 0, 0], + assert_equal([2004, 11, 1, 0, 0, 0], [d.year, d.strftime('%W').to_i, d.wday, d.hour, d.min, d.sec]) end |