tenderlove	2011-11-30 09:21:27 +0900 (Wed, 30 Nov 2011)

  New Revision: 33903

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33903

  Log:
    merge revision(s) 33775:
    
    * ext/psych/lib/psych.rb (load_file): make sure opened yaml files are
      also closed. [ruby-core:41088]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/psych/lib/psych.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 33902)
+++ ruby_1_9_3/ChangeLog	(revision 33903)
@@ -1,3 +1,8 @@
+Thu Nov 17 10:36:46 2011  Aaron Patterson <aaron@t...>
+
+	* 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  <ruby-core@m...>
 
 	* numeric.c (dbl2ival): Fix Float#divmod and #round for 32 bit
Index: ruby_1_9_3/ext/psych/lib/psych.rb
===================================================================
--- ruby_1_9_3/ext/psych/lib/psych.rb	(revision 33902)
+++ ruby_1_9_3/ext/psych/lib/psych.rb	(revision 33903)
@@ -226,7 +226,7 @@
   # 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:
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 33902)
+++ ruby_1_9_3/version.h	(revision 33903)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/