kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r29438 from trunk into ruby_1_9_2.

Browse source 
--
* error.c (syserr_initialize): set the encoding of Errno::*#message
  as locale. [ruby-dev:42358]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30035 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-12-02 08:06:29 +00:00
parent 9b6125398f
commit dcc316b825
4 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Oct 11 14:03:54 2010 NARUSE, Yui <naruse@ruby-lang.org>
* error.c (syserr_initialize): set the encoding of Errno::*#message
as locale. [ruby-dev:42358]
Mon Oct 11 06:11:30 2010 NARUSE, Yui <naruse@ruby-lang.org>
* io.c (rb_io_set_encoding): use rb_funcall2 when the io is not

1
error.c
View file

@ -1045,6 +1045,7 @@ syserr_initialize(int argc, VALUE *argv, VALUE self)
else {
mesg = rb_str_new2(err);
}
rb_enc_associate(mesg, rb_locale_encoding());
rb_call_super(1, &mesg);
rb_iv_set(self, "errno", error);
return self;

4
test/ruby/test_exception.rb
View file

@ -312,4 +312,8 @@ end.join
e = assert_raise(NoMethodError) {str.__send__(id)}
assert_equal("undefined method `#{id}' for #{str.inspect}:String", e.message, bug3237)
end
def test_errno
assert_equal(Encoding.find("locale"), Errno::EINVAL.new.message.encoding)
end
end

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 65
#define RUBY_PATCHLEVEL 66
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1