From fba7863392bdf1c968f574de129c14ae30784f88 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 5 Dec 2009 02:36:11 +0000 Subject: merges r25353 and r25362 from trunk into ruby_1_9_1. -- * lib/csv.rb (CSV#read_to_char): set encoding and verify data which read from io before encode it to @encoding. * lib/csv.rb (CSV#raw_encoding): add to get @io's encoding. * lib/csv.rb (CSV#read_io): add to read string and set @io's encoding. -- * lib/csv.rb (CSV#raw_encoding): returns ASCII-8BIT when the io doesn't have encoding. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 98c1a378cc..9dd65f7ddc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Fri Oct 16 12:03:31 2009 NARUSE, Yui + + * lib/csv.rb (CSV#raw_encoding): returns ASCII-8BIT when the io + doesn't have encoding. + +Fri Oct 16 03:15:52 2009 NARUSE, Yui + + * lib/csv.rb (CSV#read_to_char): set encoding and verify data + which read from io before encode it to @encoding. + + * lib/csv.rb (CSV#raw_encoding): add to get @io's encoding. + + * lib/csv.rb (CSV#read_io): add to read string and set @io's + encoding. + Mon Sep 28 22:33:11 2009 Nobuyoshi Nakada * dln.c (aix_loaderror): needs format string. -- cgit v1.2.3