From 488db7997d32e8cd5a9da01ccc40cc133c030205 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 24 Jan 2008 10:36:24 +0000
Subject: [PATCH] * lib/uri/generic.rb (URI::Generic::inspect): use Kernel#to_s
 instead  object_id with printf.  [ruby-dev:33347]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15216 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 5 +++++
 lib/uri/generic.rb | 3 ++-
 version.h          | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bfbc1e5591..ca30ade6a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 24 19:36:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic::inspect): use Kernel#to_s instead
+	 object_id with printf.  [ruby-dev:33347]
+
 Tue Jan 22 11:22:47 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/setup.mak ($(ARCH)): if a macro is appended by $(APPEND),
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
index 2b66adeb93..88b5078466 100644
--- a/lib/uri/generic.rb
+++ b/lib/uri/generic.rb
@@ -1103,8 +1103,9 @@ module URI
       end
     end
 
+    @@to_s = Kernel.instance_method(:to_s)
     def inspect
-      sprintf("#<%s:%#0x URL:%s>", self.class.to_s, self.object_id, self.to_s)
+      @@to_s.bind(self).call.sub!(/>\z/) {" URL:#{self}>"}
     end
 
     def coerce(oth)
diff --git a/version.h b/version.h
index 5289e43c09..e3c4514b83 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-01-22"
+#define RUBY_RELEASE_DATE "2008-01-24"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080122
+#define RUBY_RELEASE_CODE 20080124
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 24
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];