Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

* ext/psych/parser.c: fall back to any encoding if the external

  encoding is wrong.  [ruby-core:44163]
* test/psych/test_encoding.rb: fix test
  • Loading branch information...
commit 62476ce4478c791da949917a580dae51dc600dd3 1 parent f0040f6
@tenderlove authored
View
6 CHANGELOG.rdoc
@@ -1,3 +1,9 @@
+Sat Apr 7 02:07:00 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/parser.c: fall back to any encoding if the external
+ encoding is wrong. [ruby-core:44163]
+ * test/psych/test_encoding.rb: fix test
+
Fri Mar 9 06:29:22 2012 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych.rb (load, parse): stop parsing or loading after
View
7 ext/psych/parser.c
@@ -146,10 +146,11 @@ static VALUE transcode_io(VALUE src, int * parser_encoding)
return src;
}
- rb_raise(rb_eArgError, "YAML file must be UTF-8, UTF-16LE, or UTF-16BE, not %s",
- rb_enc_name(rb_enc_from_index(io_external_enc_index)));
+ /* If the external encoding is something we don't know how to handle,
+ * fall back to YAML_ANY_ENCODING. */
+ *parser_encoding = YAML_ANY_ENCODING;
- return Qnil;
+ return src;
}
#endif
View
2  test/psych/test_encoding.rb
@@ -57,7 +57,7 @@ def test_io_shiftjis
# If the external encoding isn't utf8, utf16le, or utf16be, we cannot
# process the file.
File.open(t.path, 'r', :encoding => 'SHIFT_JIS') do |f|
- assert_raises ArgumentError do
+ assert_raises Psych::SyntaxError do
Psych.load(f)
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.