merge revision(s) r33265:

	* lib/pstore.rb, test/test_pstore.rb: suppress warnings with -v.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33452 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 4 insertions, 5 deletions

diff --git a/lib/pstore.rb b/lib/pstore.rb
index 020b028666..429d7e5c7d 100644
--- a/lib/pstore.rb
+++ b/lib/pstore.rb
@@ -437,6 +437,7 @@ class PStore
     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
diff --git a/test/test_pstore.rb b/test/test_pstore.rb
index 21831903cf..e8a1032c98 100644
--- a/test/test_pstore.rb
+++ b/test/test_pstore.rb
@@ -116,10 +116,8 @@ class PStoreTest < Test::Unit::TestCase
   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
diff --git a/version.h b/version.h
index 6a60143b62..279445376f 100644
--- a/version.h
+++ b/version.h
@@ -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"