aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-16 22:54:53 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-16 22:54:53 +0000
commit517c3385b121680d9db40a841deb6d57fc815821 (patch)
treef6459f8dc677fbc49a134936fa23d9c20a80181e
parent105a9e036c7f73913f2910858c1e6afce23378e8 (diff)
downloadruby-517c3385b121680d9db40a841deb6d57fc815821.tar.gz
* lib/csv.rb: Document #raw_encoding. Patch by David Czarnecki.
[Ruby 1.9 - Bug #4874] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/csv.rb4
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f5b32a3063..432baa8cd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 17 07:53:50 2011 Eric Hodel <drbrain@segment7.net>
+
+ * lib/csv.rb: Document #raw_encoding. Patch by David Czarnecki.
+ [Ruby 1.9 - Bug #4874]
+
Fri Jun 17 07:46:50 2011 Eric Hodel <drbrain@segment7.net>
* lib/benchmark.rb: Document Benchmark::Tms#memberwise. Patch by
diff --git a/lib/csv.rb b/lib/csv.rb
index 50aba3d91e..ce05164c75 100644
--- a/lib/csv.rb
+++ b/lib/csv.rb
@@ -2319,6 +2319,10 @@ class CSV
private
+ #
+ # Returns the encoding of the internal IO object or the +default+ if the
+ # encoding cannot be determined.
+ #
def raw_encoding(default = Encoding::ASCII_8BIT)
if @io.respond_to? :internal_encoding
@io.internal_encoding || @io.external_encoding