* ext/psych/lib/psych/visitors/yaml_tree.rb (format_time): nanoseconds

require more digits when dumping. Thanks akr! [ruby-core:31047]
* test/psych/visitors/test_to_ruby.rb: adjusting tests for nanoseconds

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28551 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tenderlove 2010-07-05 23:12:44 +00:00
parent f32ae44629
commit c27e0ebab6
2 changed files with 5 additions and 5 deletions

View File

@ -271,9 +271,9 @@ module Psych
def format_time time
formatted = time.strftime("%Y-%m-%d %H:%M:%S")
if time.utc?
formatted += ".%06dZ" % [time.nsec]
formatted += ".%09dZ" % [time.nsec]
else
formatted += ".%06d %+.2d:%.2d" % [time.nsec,
formatted += ".%09d %+.2d:%.2d" % [time.nsec,
time.gmt_offset / 3600, time.gmt_offset % 3600 / 60]
end
formatted

View File

@ -113,7 +113,7 @@ description:
def test_time
now = Time.now
formatted = now.strftime("%Y-%m-%d %H:%M:%S") +
".%06d %+.2d:00" % [now.nsec, now.gmt_offset / 3600]
".%09d %+.2d:00" % [now.nsec, now.gmt_offset / 3600]
assert_equal now, Nodes::Scalar.new(formatted).to_ruby
end
@ -121,7 +121,7 @@ description:
def test_time_utc
now = Time.now.utc
formatted = now.strftime("%Y-%m-%d %H:%M:%S") +
".%06dZ" % [now.nsec]
".%09dZ" % [now.nsec]
assert_equal now, Nodes::Scalar.new(formatted).to_ruby
end
@ -129,7 +129,7 @@ description:
def test_time_utc_no_z
now = Time.now.utc
formatted = now.strftime("%Y-%m-%d %H:%M:%S") +
".%06d" % [now.nsec]
".%09d" % [now.nsec]
assert_equal now, Nodes::Scalar.new(formatted).to_ruby
end