yugui	2008-11-30 18:22:38 +0900 (Sun, 30 Nov 2008)

  New Revision: 20408

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20408

  Log:
    merges r20347 from trunk into ruby_1_9_1.
    * lib/date/format.rb (strftime): ignores '_' flag for %[LN].

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/date/format.rb
    branches/ruby_1_9_1/test/date/test_date_strftime.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20407)
+++ ruby_1_9_1/ChangeLog	(revision 20408)
@@ -1,3 +1,7 @@
+Tue Nov 25 01:23:25 2008  Tadayoshi Funaba  <tadf@d...>
+
+	* lib/date/format.rb (strftime): ignores '_' flag for %[LN].
+
 Sat Nov 29 00:27:33 2008  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* thread.c, thread_pthread.c, thread_win32.c: merges nobu's commits - 
Index: ruby_1_9_1/lib/date/format.rb
===================================================================
--- ruby_1_9_1/lib/date/format.rb	(revision 20407)
+++ ruby_1_9_1/lib/date/format.rb	(revision 20408)
@@ -255,6 +255,7 @@
       when 'j'; emit_n(yday, 3, f)
       when 'k'; emit_a(hour, 2, f)
       when 'L'
+	f[:p] = nil
 	w = f[:w] || 3
 	u = 10**w
 	emit_n((sec_fraction * u).floor, w, f)
@@ -262,6 +263,7 @@
       when 'M', 'OM'; emit_n(min, 2, f)
       when 'm', 'Om'; emit_n(mon, 2, f)
       when 'N'
+	f[:p] = nil
 	w = f[:w] || 9
 	u = 10**w
 	emit_n((sec_fraction * u).floor, w, f)
Index: ruby_1_9_1/test/date/test_date_strftime.rb
===================================================================
--- ruby_1_9_1/test/date/test_date_strftime.rb	(revision 20407)
+++ ruby_1_9_1/test/date/test_date_strftime.rb	(revision 20408)
@@ -299,6 +299,24 @@
     assert_equal('-2000', d.strftime('%05Y'))
   end
 
+  def test_strftime__gnuext_LN # coreutils
+    d = DateTime.parse('2008-11-25T00:11:22.0123456789')
+    assert_equal('012', d.strftime('%L'))
+    assert_equal('012', d.strftime('%0L'))
+    assert_equal('0', d.strftime('%1L'))
+    assert_equal('01', d.strftime('%2L'))
+    assert_equal('01234567890', d.strftime('%11L'))
+    assert_equal('01234567890', d.strftime('%011L'))
+    assert_equal('01234567890', d.strftime('%_11L'))
+    assert_equal('012345678', d.strftime('%N'))
+    assert_equal('012345678', d.strftime('%0N'))
+    assert_equal('0', d.strftime('%1N'))
+    assert_equal('01', d.strftime('%2N'))
+    assert_equal('01234567890', d.strftime('%11N'))
+    assert_equal('01234567890', d.strftime('%011N'))
+    assert_equal('01234567890', d.strftime('%_11N'))
+  end
+
   def test_strftime__gnuext_z # coreutils
     d = DateTime.parse('2006-08-08T23:15:33+09:08:07')
     assert_equal('+0908', d.strftime('%z'))

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/