1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

csv.rb: get rid of discarding coderange

Browse Source 
* lib/csv.rb (CSV#<<): use StringIO#set_encoding instead of creating
  new StringIO instance with String#force_encoding, forcing encoding
  discards the cached coderange bits and can make further operations
  very slow.  [ruby-core:55714] [Bug #8585]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41722 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-07-01 06:05:03 +00:00
parent 8776802385
commit 45c2532e59
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,4 +1,9 @@
Mon Jul 1 15:04:20 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Jul 1 15:05:00 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/csv.rb (CSV#<<): use StringIO#set_encoding instead of creating
new StringIO instance with String#force_encoding, forcing encoding
discards the cached coderange bits and can make further operations
very slow. [ruby-core:55714] [Bug #8585]
* ext/stringio/stringio.c (strio_write): keep coderange of * ext/stringio/stringio.c (strio_write): keep coderange of
ptr->string. ptr->string.

2
lib/csv.rb
View File

@ -1655,7 +1655,7 @@ class CSV
if @io.is_a?(StringIO) and if @io.is_a?(StringIO) and
output.encoding != raw_encoding and output.encoding != raw_encoding and
(compatible_encoding = Encoding.compatible?(@io.string, output)) (compatible_encoding = Encoding.compatible?(@io.string, output))
@io = StringIO.new(@io.string.force_encoding(compatible_encoding)) @io.set_encoding(compatible_encoding)
@io.seek(0, IO::SEEK_END) @io.seek(0, IO::SEEK_END)
end end
@io << output @io << output