summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-10-04 07:37:11 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-10-04 07:37:11 +0000
commit4eb497d90b0d439458e7f34046bbe41d38e4c06a (patch)
tree7fca0af86872c6cc1450a4137f25c7d8876b0978
parentbf8168cf334e45ce6e93fa5aedc74ab7ca4069f3 (diff)
* lib/time.rb (Time.strptime): use Time.at if d[:seconds] is set.
Reported by Christopher Eberz. [ruby-core:39903] Bug #5399 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33398 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/time.rb10
-rw-r--r--test/test_time.rb1
3 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 60564af72d..4e9a34e0d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 4 16:17:50 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/time.rb (Time.strptime): use Time.at if d[:seconds] is set.
+ Reported by Christopher Eberz. [ruby-core:39903] Bug #5399
+
Tue Oct 4 15:04:43 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* class.c (class_alloc): allocate extra memory after containing
diff --git a/lib/time.rb b/lib/time.rb
index 4eb888aef6..26c083d309 100644
--- a/lib/time.rb
+++ b/lib/time.rb
@@ -280,9 +280,13 @@ class Time
def strptime(date, format, now=self.now)
d = Date._strptime(date, format)
raise ArgumentError, "invalid strptime format - `#{format}'" unless d
- year = d[:year]
- year = yield(year) if year && block_given?
- make_time(year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now)
+ if seconds = d[:seconds]
+ Time.at(seconds)
+ else
+ year = d[:year]
+ year = yield(year) if year && block_given?
+ make_time(year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now)
+ end
end
MonthValue = {
diff --git a/test/test_time.rb b/test/test_time.rb
index d3f3c22dff..9dbce3f654 100644
--- a/test/test_time.rb
+++ b/test/test_time.rb
@@ -392,6 +392,7 @@ class TestTimeExtension < Test::Unit::TestCase # :nodoc:
def test_strptime
assert_equal(Time.utc(2005, 8, 28, 06, 54, 20), Time.strptime("28/Aug/2005:06:54:20 +0000", "%d/%b/%Y:%T %z"))
+ assert_equal(Time.at(1).localtime, Time.strptime("1", "%s"))
end
def test_nsec