From b4876f5e0422e020d617b77145a492c5bc327f08 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 25 Dec 2010 07:04:38 +0000 Subject: * lib/csv.rb (CSV::foreach, CSV#initialize): directly use encoding git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30354 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/csv.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/csv.rb b/lib/csv.rb index 1ad019a269..266810cb93 100644 --- a/lib/csv.rb +++ b/lib/csv.rb @@ -1203,10 +1203,7 @@ class CSV # but transcode it to UTF-8 before CSV parses it. # def self.foreach(path, options = Hash.new, &block) - encoding = options.delete(:encoding) - mode = "rb" - mode << ":#{encoding}" if encoding - open(path, mode, options) do |csv| + open(path, 'rb', options) do |csv| csv.each(&block) end end @@ -1564,7 +1561,8 @@ class CSV # create the IO object we will read from @io = data.is_a?(String) ? StringIO.new(data) : data # honor the IO encoding if we can, otherwise default to ASCII-8BIT - @encoding = raw_encoding || Encoding.default_internal || + @encoding = options.delete(:internal_encoding) || options.delete(:encoding) || + raw_encoding || Encoding.default_internal || Encoding.default_external # # prepare for building safe regular expressions in the target encoding, -- cgit v1.2.1