nobu	2011-09-13 20:21:52 +0900 (Tue, 13 Sep 2011)

  New Revision: 33265

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

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

  Modified files:
    trunk/ChangeLog
    trunk/lib/pstore.rb
    trunk/test/test_pstore.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33264)
+++ ChangeLog	(revision 33265)
@@ -1,5 +1,7 @@
-Tue Sep 13 15:02:48 2011  Nobuyoshi Nakada  <nobu@r...>
+Tue Sep 13 20:21:49 2011  Nobuyoshi Nakada  <nobu@r...>
 
+	* lib/pstore.rb, test/test_pstore.rb: suppress warnings with -v.
+
 	* lib/pstore.rb (PStore): always open in binary mode even if
 	  default encodings are set.  [Bug #5311] [ruby-core:39503]
 
Index: lib/pstore.rb
===================================================================
--- lib/pstore.rb	(revision 33264)
+++ lib/pstore.rb	(revision 33265)
@@ -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: test/test_pstore.rb
===================================================================
--- test/test_pstore.rb	(revision 33264)
+++ test/test_pstore.rb	(revision 33265)
@@ -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/