aboutsummaryrefslogtreecommitdiffstats
path: root/test/psych/test_parser.rb
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-23 23:12:57 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-23 23:12:57 +0000
commit774cf315e838216aa8b4c138173484aa2388c380 (patch)
tree9be3c41dd133ab1a383fac0fbca9161ebf4051b3 /test/psych/test_parser.rb
parent0e0286404ff2a3b4298d1ebab65d0f351caf098e (diff)
downloadruby-774cf315e838216aa8b4c138173484aa2388c380.tar.gz
* ext/psych/parser.c: set parser encoding based on the YAML input
rather than user configuration. * test/psych/test_encoding.rb: corresponding tests. * test/psych/test_parser.rb: ditto * test/psych/test_tainted.rb: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/psych/test_parser.rb')
-rw-r--r--test/psych/test_parser.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/psych/test_parser.rb b/test/psych/test_parser.rb
index a491d7fdd6..cfbfb61693 100644
--- a/test/psych/test_parser.rb
+++ b/test/psych/test_parser.rb
@@ -112,6 +112,7 @@ module Psych
def test_bogus_io
o = Object.new
+ def o.external_encoding; nil end
def o.read len; self end
assert_raises(TypeError) do