diff options
| author | zzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-03 06:13:56 +0000 |
|---|---|---|
| committer | zzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-03 06:13:56 +0000 |
| commit | 3e028faf7c0a5bf2ac491b4368edc75b6980489b (patch) | |
| tree | 7745fa900ca0d2436bc9d04ea2219b1625a67dbd | |
| parent | e25d55ae08230ba7ed597f00ecac20a546aae719 (diff) | |
* 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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38680 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/psych/lib/psych.rb | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Thu Jan 3 15:13:00 2013 Zachary Scott <zachary@zacharyscott.net> + + * 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@zacharyscott.net> * lib/forwardable.rb (SingleForwardable): Fix example in overview diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb index 9aab728e99..e9571b7414 100644 --- a/ext/psych/lib/psych.rb +++ b/ext/psych/lib/psych.rb @@ -123,7 +123,7 @@ module Psych # 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 # 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 # 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. |