From 47bd6a4f37cb14701458233479caaaf3a25397b3 Mon Sep 17 00:00:00 2001 From: ser Date: Sat, 9 Apr 2005 17:03:32 +0000 Subject: Applied Nobu's patch to the XML document encoding structure in REXML. It passes all of REXML's native tests as well as a couple of others, and should fix potential threading issues. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rexml/encodings/ISO-8859-1.rb | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'lib/rexml/encodings/ISO-8859-1.rb') diff --git a/lib/rexml/encodings/ISO-8859-1.rb b/lib/rexml/encodings/ISO-8859-1.rb index f4e4527c2d..2873d13bf0 100644 --- a/lib/rexml/encodings/ISO-8859-1.rb +++ b/lib/rexml/encodings/ISO-8859-1.rb @@ -1,25 +1,7 @@ +require 'rexml/encodings/US-ASCII' + module REXML module Encoding - @@__REXML_encoding_methods = %q~ - # Convert from UTF-8 - def encode content - array_utf8 = content.unpack('U*') - array_enc = [] - array_utf8.each do |num| - if num <= 0xFF - array_enc << num - else - # Numeric entity (&#nnnn;); shard by Stefan Scholl - array_enc.concat "&\##{num};".unpack('C*') - end - end - array_enc.pack('C*') - end - - # Convert to UTF-8 - def decode(str) - str.unpack('C*').pack('U*') - end - ~ + register("ISO-8859-1", &encoding_method("US-ASCII")) end end -- cgit v1.2.3