From bc486a224e8c8adece10877b559dd5e4e8c8312b Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 16 Oct 2009 03:04:38 +0000
Subject: * lib/csv.rb (CSV#raw_encoding): returns ASCII-8BIT when the io  
 doesn't have encoding.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25362 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog  | 5 +++++
 lib/csv.rb | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ea57286ff..2c569b6a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 16 12:03:31 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* 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  <naruse@ruby-lang.org>
 
 	* lib/csv.rb (CSV#read_to_char): set encoding and verify data
diff --git a/lib/csv.rb b/lib/csv.rb
index 8545e661b..d44e4db74 100644
--- a/lib/csv.rb
+++ b/lib/csv.rb
@@ -2288,8 +2288,10 @@ class CSV
       @io.internal_encoding || @io.external_encoding
     elsif @io.is_a? StringIO
       @io.string.encoding
-    else
+    elsif @io.respond_to? :encoding
       @io.encoding
+    else
+      Encoding::ASCII_8BIT
     end
   end
 
-- 
cgit