archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 09:33:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

* backport of r32600 from trunk

Browse source 
* lib/csv.rb: Do not modify CSV.generate's argument [ruby-core:38356]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
marcandre 2011-07-21 21:40:21 +00:00
parent 1d9cac36ea
commit 01e1dcef9a
3 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Fri Jul 22 06:39:34 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* lib/csv.rb: Do not modify CSV.generate's argument [ruby-core:38356]
Thu Jul 21 20:02:11 2011 Yusuke Endoh <mame@tsg.ne.jp> Thu Jul 21 20:02:11 2011 Yusuke Endoh <mame@tsg.ne.jp>
* thread.c (set_trace_func, thread_set_trace_func_m): reset tracing * thread.c (set_trace_func, thread_set_trace_func_m): reset tracing

2
lib/csv.rb
View file

@ -1234,7 +1234,7 @@ class CSV
io.seek(0, IO::SEEK_END) io.seek(0, IO::SEEK_END)
args.unshift(io) args.unshift(io)
else else
encoding = args.last.is_a?(Hash) ? args.last.delete(:encoding) : nil encoding = (args[-1] = args[-1].dup).delete(:encoding) if args.last.is_a?(Hash)
str = "" str = ""
str.encode!(encoding) if encoding str.encode!(encoding) if encoding
args.unshift(str) args.unshift(str)

15
test/csv/test_interface.rb
View file

@ -316,4 +316,19 @@ class TestCSV::Interface < TestCSV
assert_equal(STDOUT, CSV.instance.instance_eval { @io }) assert_equal(STDOUT, CSV.instance.instance_eval { @io })
assert_equal(STDOUT, CSV { |new_csv| new_csv.instance_eval { @io } }) assert_equal(STDOUT, CSV { |new_csv| new_csv.instance_eval { @io } })
end end
def test_options_are_not_modified
opt = {}.freeze
assert_nothing_raised { CSV.foreach(@path, opt) }
assert_nothing_raised { CSV.open(@path, opt){} }
assert_nothing_raised { CSV.parse("", opt) }
assert_nothing_raised { CSV.parse_line("", opt) }
assert_nothing_raised { CSV.read(@path, opt) }
assert_nothing_raised { CSV.readlines(@path, opt) }
assert_nothing_raised { CSV.table(@path, opt) }
assert_nothing_raised { CSV.generate(opt){} }
assert_nothing_raised { CSV.generate_line([], opt) }
assert_nothing_raised { CSV.filter("", "", opt){} }
assert_nothing_raised { CSV.instance("", opt) }
end
end end