archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 08:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r21074 from trunk into ruby_1_9_1.

Browse source 
* lib/csv.rb:  Using a more robust transcoding scheme to produce
  ASCII compatible inspect() messages.  [ruby-dev:37591]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21081 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2008-12-27 02:16:12 +00:00
parent 2b29e9f40e
commit 6a1c295da6
2 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/csv.rb
View file

@ -199,7 +199,7 @@ require "stringio"
#
class CSV
# The version of the installed library.
VERSION = "2.4.4".freeze
VERSION = "2.4.5".freeze
#
# A CSV::Row is part Array and part Hash. It retains an order for the fields
@ -487,7 +487,7 @@ class CSV
end
alias_method :to_s, :to_csv
# A summary of fields, by header, in an ASCII-8BIT String.
# A summary of fields, by header, in an ASCII compatible String.
def inspect
str = ["#<", self.class.to_s]
each do |header, field|
@ -495,7 +495,14 @@ class CSV
":" << field.inspect
end
str << ">"
str.map { |s| s.encode("ASCII-8BIT") }.join
begin
str.join
rescue # any encoding error
str.map do |s|
e = Encoding::Converter.asciicompat_encoding(s.encoding)
e ? s.encode(e) : s.force_encoding("ASCII-8BIT")
end.join
end
end
end
@ -1899,7 +1906,7 @@ class CSV
#
# Returns a simplified description of the key FasterCSV attributes in an
# ASCII-8BIT String.
# ASCII compatible String.
#
def inspect
str = ["<#", self.class.to_s, " io_type:"]
@ -1926,7 +1933,14 @@ class CSV
str << " headers:" << headers.inspect
end
str << ">"
str.map { |s| s.encode("ASCII-8BIT") }.join
begin
str.join
rescue # any encoding error
str.map do |s|
e = Encoding::Converter.asciicompat_encoding(s.encoding)
e ? s.encode(e) : s.force_encoding("ASCII-8BIT")
end.join
end
end
private