merges r30351 from trunk into ruby_1_9_2.

--
* test/csv/test_encodings.rb (TestEncodings#setup): fix evil test
  suite writing to the source directory.

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

3 files changed, 11 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 45aa0d1b29..3bcd981bd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 25 15:04:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/csv/test_encodings.rb (TestEncodings#setup): fix evil test
+	  suite writing to the source directory.
+
 Sat Dec 25 14:27:09 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (rb_io_extract_encoding_option): accept Encoding object as
diff --git a/test/csv/test_encodings.rb b/test/csv/test_encodings.rb
index 3dc80ccdb1..bea4c620bb 100644
--- a/test/csv/test_encodings.rb
+++ b/test/csv/test_encodings.rb
@@ -13,11 +13,14 @@ require "csv"
 
 class TestEncodings < Test::Unit::TestCase
   def setup
-    @temp_csv_path = File.join(File.dirname(__FILE__), "temp.csv")
+    require 'tempfile'
+    @temp_csv_file = Tempfile.new(%w"test_csv. .csv")
+    @temp_csv_path = @temp_csv_file.path
+    @temp_csv_file.close
   end
 
   def teardown
-    File.unlink(@temp_csv_path) if File.exist? @temp_csv_path
+    @temp_csv_file.close!
   end
 
   ########################################
diff --git a/version.h b/version.h
index ed6392506a..cb5e9916d1 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 138
+#define RUBY_PATCHLEVEL 139
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1