yyyy/mm is not an acceptable format.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 5ca63d2796..08533e651d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Aug 31 10:17:02 2003  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb: yyyy/mm is not an acceptable format.
+
+	* lib/time.rb: follow above.
+
 Sat Aug 30 14:25:43 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_iter_break): should not call TAG_JUMP directly.
diff --git a/lib/date/format.rb b/lib/date/format.rb
index 7aa4747ecf..f00f60ab47 100644
--- a/lib/date/format.rb
+++ b/lib/date/format.rb
@@ -356,7 +356,7 @@ class Date
 	end
       end
 
-      if $1.size > 2
+      if $3 && $1.size > 2
 	comp = false
 	year, mon, mday = mon, mday, year
       end
diff --git a/lib/time.rb b/lib/time.rb
index 043257a4d1..115e7e9633 100644
--- a/lib/time.rb
+++ b/lib/time.rb
@@ -99,7 +99,7 @@ class Time
     #     # your timezone is GMT:
     #     Time.parse("16:30")     #=> Thu Nov 29 16:30:00 GMT 2001
     #     Time.parse("7/23")      #=> Mon Jul 23 00:00:00 GMT 2001
-    #     Time.parse("2002/1")    #=> Tue Jan 01 00:00:00 GMT 2002
+    #     Time.parse("Aug 31")    #=> Fri Aug 31 00:00:00 GMT 2001
     #
     # Since there are numerous conflicts among locally defined timezone
     # abbreviations all over the world, this method is not made to
@@ -525,8 +525,6 @@ if __FILE__ == $0
                    Time.parse("2001/11/29 21:12", now))
       assert_equal(Time.local( 2001,11,29),
                    Time.parse("2001/11/29", now))
-      assert_equal(Time.local( 2001,11),
-                   Time.parse("2001/11", now))
       assert_equal(Time.local( 2001,11,29),
                    Time.parse(     "11/29", now))
       #assert_equal(Time.local(2001,11,1), Time.parse("Nov", now))