From 58398d5106d2f56e30d112fdbafe472a1beaf387 Mon Sep 17 00:00:00 2001 From: tenderlove Date: Wed, 30 Nov 2011 00:21:27 +0000 Subject: merge revision(s) 33775: * ext/psych/lib/psych.rb (load_file): make sure opened yaml files are also closed. [ruby-core:41088] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33903 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/psych/lib/psych.rb | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f6a7d3936..bd816352fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Nov 17 10:36:46 2011 Aaron Patterson + + * ext/psych/lib/psych.rb (load_file): make sure opened yaml files are + also closed. [ruby-core:41088] + Wed Nov 30 02:58:46 2011 Marc-Andre Lafortune * numeric.c (dbl2ival): Fix Float#divmod and #round for 32 bit diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb index cf17eaaa27..9507bbb53b 100644 --- a/ext/psych/lib/psych.rb +++ b/ext/psych/lib/psych.rb @@ -226,7 +226,7 @@ module Psych # Load the document contained in +filename+. Returns the yaml contained in # +filename+ as a ruby object def self.load_file filename - self.load File.open(filename) + File.open(filename) { |f| self.load f } end # :stopdoc: diff --git a/version.h b/version.h index ab13fe6e43..937b374b47 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 3 +#define RUBY_PATCHLEVEL 4 #define RUBY_RELEASE_DATE "2011-11-30" #define RUBY_RELEASE_YEAR 2011 -- cgit v1.2.3