[前][次][番号順一覧][スレッド一覧]

ruby-changes:25306

From: kou <ko1@a...>
Date: Sun, 28 Oct 2012 19:57:13 +0900 (JST)
Subject: [ruby-changes:25306] kou:r37358 (trunk): * lib/rexml/source.rb (REXML::IOSource#initialize): Use

kou	2012-10-28 19:57:01 +0900 (Sun, 28 Oct 2012)

  New Revision: 37358

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37358

  Log:
    * lib/rexml/source.rb (REXML::IOSource#initialize): Use
      encode("UTF-16XX") instead of UTF-16XX encoded byte string by
      hand.

  Modified files:
    trunk/ChangeLog
    trunk/lib/rexml/source.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37357)
+++ ChangeLog	(revision 37358)
@@ -1,3 +1,9 @@
+Sun Oct 28 19:54:43 2012  Kouhei Sutou  <kou@c...>
+
+	* lib/rexml/source.rb (REXML::IOSource#initialize): Use
+	  encode("UTF-16XX") instead of UTF-16XX encoded byte string by
+	  hand.
+
 Sun Oct 28 19:12:11 2012  Tadayoshi Funaba  <tadf@d...>
 
 	* ext/date/date_parse.c (iso8601_{ext,bas}_time): should not match
Index: lib/rexml/source.rb
===================================================================
--- lib/rexml/source.rb	(revision 37357)
+++ lib/rexml/source.rb	(revision 37358)
@@ -149,9 +149,9 @@
       if encoding
         self.encoding = encoding
       elsif str[0,2] == "\xfe\xff"
-        @line_break = "\000>"
+        @line_break = ">".encode("UTF-16BE")
       elsif str[0,2] == "\xff\xfe"
-        @line_break = ">\000"
+        @line_break = ">".encode("UTF-16LE")
       elsif str[0,2] == "\xef\xbb"
         str += @source.read(1)
         str = '' if (str[2,1] == "\xBF")

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]