naruse	2011-10-11 08:14:17 +0900 (Tue, 11 Oct 2011)

  New Revision: 33452

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

  Log:
    merge revision(s) r33265:
    
    * lib/pstore.rb, test/test_pstore.rb: suppress warnings with -v.

  Modified files:
    branches/ruby_1_9_3/lib/pstore.rb
    branches/ruby_1_9_3/test/test_pstore.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/lib/pstore.rb
===================================================================
--- ruby_1_9_3/lib/pstore.rb	(revision 33451)
+++ ruby_1_9_3/lib/pstore.rb	(revision 33452)
@@ -437,6 +437,7 @@
     rescue
       result = false
     end
+    self.class.instance_method(:marshal_dump_supports_canonical_option?)
     self.class.__send__(:define_method, :marshal_dump_supports_canonical_option?) do
       result
     end
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 33451)
+++ ruby_1_9_3/version.h	(revision 33452)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
 #define RUBY_PATCHLEVEL -1
 
-#define RUBY_RELEASE_DATE "2011-10-10"
+#define RUBY_RELEASE_DATE "2011-10-11"
 #define RUBY_RELEASE_YEAR 2011
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 11
 
 #include "ruby/version.h"
 
Index: ruby_1_9_3/test/test_pstore.rb
===================================================================
--- ruby_1_9_3/test/test_pstore.rb	(revision 33451)
+++ ruby_1_9_3/test/test_pstore.rb	(revision 33452)
@@ -116,10 +116,8 @@
   def test_pstore_files_are_accessed_as_binary_files
     bug5311 = '[ruby-core:39503]'
     n = 128
-    assert_in_out_err(["-rpstore", "-", @pstore_file], <<-SRC, [bug5311], [], bug5311)
+    assert_in_out_err(["-Eutf-8:utf-8", "-rpstore", "-", @pstore_file], <<-SRC, [bug5311], [], bug5311)
       @pstore = PStore.new(ARGV[0])
-      Encoding.default_internal = 'utf-8'
-      Encoding.default_external = 'utf-8'
       (1..#{n}).each do |i|
         @pstore.transaction {@pstore["Key\#{i}"] = "value \#{i}"}
       end

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