From b028e8d45d90bec5ee5bcc9c4e42adc96f5d6f14 Mon Sep 17 00:00:00 2001 From: jeg2 Date: Wed, 17 Nov 2010 15:03:25 +0000 Subject: * lib/csv.rb: Upgrading output encoding with ASCII content as needed. [ruby-core:33229] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/csv.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/csv.rb b/lib/csv.rb index fe7309009b..31388bc9da 100644 --- a/lib/csv.rb +++ b/lib/csv.rb @@ -1715,8 +1715,7 @@ class CSV output = row.map(&@quote).join(@col_sep) + @row_sep # quote and separate if @io.is_a?(StringIO) and output.encoding != raw_encoding and - ( compatible_encoding = Encoding.compatible?( @io.string.encoding, - output.encoding ) ) + (compatible_encoding = Encoding.compatible?(@io.string, output)) @io = StringIO.new(@io.string.force_encoding(compatible_encoding)) @io.seek(0, IO::SEEK_END) end -- cgit v1.2.3