summaryrefslogtreecommitdiff
path: root/lib/time.rb
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-01 00:12:48 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-01 00:12:48 +0000
commit9ee9812dad9c59c0638d52325546e01a40904d10 (patch)
treee9da822666d96f487438339406f6315787bd0cf7 /lib/time.rb
parentfe6cf485e6e1d23766a81246e825b61eb534c176 (diff)
* lib/time.rb (strptime): Support %s.%N.
[ruby-core:68301] [Bug #10904] Patch by Sadayuki Furuhashi. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/time.rb')
-rw-r--r--lib/time.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/time.rb b/lib/time.rb
index 8edc9e63c3..07196a3c23 100644
--- a/lib/time.rb
+++ b/lib/time.rb
@@ -426,7 +426,13 @@ class Time
d = Date._strptime(date, format)
raise ArgumentError, "invalid strptime format - `#{format}'" unless d
if seconds = d[:seconds]
- t = Time.at(seconds)
+ if sec_fraction = d[:sec_fraction]
+ usec = sec_fraction * 1000000
+ usec *= -1 if seconds < 0
+ else
+ usec = 0
+ end
+ t = Time.at(seconds, usec)
if zone = d[:zone]
force_zone!(t, zone)
end