nobu	2012-02-14 15:06:40 +0900 (Tue, 14 Feb 2012)

  New Revision: 34589

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

  Log:
    * lib/test/unit/assertions.rb (build_message): skip escaped
      question marks.

  Modified files:
    trunk/ChangeLog
    trunk/lib/test/unit/assertions.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34588)
+++ ChangeLog	(revision 34589)
@@ -1,3 +1,8 @@
+Tue Feb 14 15:06:37 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/test/unit/assertions.rb (build_message): skip escaped
+	  question marks.
+
 Tue Feb 14 12:10:04 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* variable.c (autoload_const_set, autoload_require): fix
Index: lib/test/unit/assertions.rb
===================================================================
--- lib/test/unit/assertions.rb	(revision 34588)
+++ lib/test/unit/assertions.rb	(revision 34589)
@@ -317,7 +317,7 @@
 
       def build_message(head, template=nil, *arguments) #:nodoc:
         template &&= template.chomp
-        template.gsub(/\?/) { mu_pp(arguments.shift) }
+        template.gsub(/\G((?:[^\\]|\\.)*?)(\\)?\?/) { $1 + ($2 ? "?" : mu_pp(arguments.shift)) }
       end
     end
   end

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