zzak	2013-01-03 15:13:56 +0900 (Thu, 03 Jan 2013)

  New Revision: 38680

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

  Log:
    * ext/psych/lib/psych.rb (Psych.load): Return value of
      Psych::SyntaxError.message should be same as example.
      Patch by Ippei Obayashi [ruby-core:51193] [Bug #7636]

  Modified files:
    trunk/ChangeLog
    trunk/ext/psych/lib/psych.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38679)
+++ ChangeLog	(revision 38680)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Jan  3 15:13:00 2013  Zachary Scott  <zachary@z...>
+
+	* ext/psych/lib/psych.rb (Psych.load): Return value of
+	  Psych::SyntaxError.message should be same as example.
+	  Patch by Ippei Obayashi [ruby-core:51193] [Bug #7636]
+
 Thu Jan  3 14:58:00 2013  Zachary Scott  <zachary@z...>
 
 	* lib/forwardable.rb (SingleForwardable): Fix example in overview
Index: ext/psych/lib/psych.rb
===================================================================
--- ext/psych/lib/psych.rb	(revision 38679)
+++ ext/psych/lib/psych.rb	(revision 38680)
@@ -123,7 +123,7 @@ module Psych https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych.rb#L123
   #     Psych.load("--- `", "file.txt")
   #   rescue Psych::SyntaxError => ex
   #     ex.file    # => 'file.txt'
-  #     ex.message # => "(foo.txt): found character that cannot start any token"
+  #     ex.message # => "(file.txt): found character that cannot start any token"
   #   end
   def self.load yaml, filename = nil
     result = parse(yaml, filename)
@@ -145,7 +145,7 @@ module Psych https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych.rb#L145
   #     Psych.parse("--- `", "file.txt")
   #   rescue Psych::SyntaxError => ex
   #     ex.file    # => 'file.txt'
-  #     ex.message # => "(foo.txt): found character that cannot start any token"
+  #     ex.message # => "(file.txt): found character that cannot start any token"
   #   end
   #
   # See Psych::Nodes for more information about YAML AST.
@@ -195,7 +195,7 @@ module Psych https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych.rb#L195
   #     Psych.parse_stream("--- `", "file.txt")
   #   rescue Psych::SyntaxError => ex
   #     ex.file    # => 'file.txt'
-  #     ex.message # => "(foo.txt): found character that cannot start any token"
+  #     ex.message # => "(file.txt): found character that cannot start any token"
   #   end
   #
   # See Psych::Nodes for more information about YAML AST.

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