From 9f082e7d06a4d293e79b4eb800fc6ceca4324f98 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 11 Jun 2008 06:23:18 +0000 Subject: merge revision(s) 15216: * lib/uri/generic.rb (URI::Generic::inspect): use Kernel#to_s instead object_id with printf. [ruby-dev:33347] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@17096 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/uri/generic.rb | 3 ++- version.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b0790960..f65ef39de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jun 11 15:23:13 2008 Nobuyoshi Nakada + + * lib/uri/generic.rb (URI::Generic::inspect): use Kernel#to_s instead + object_id with printf. [ruby-dev:33347] + Wed Jun 11 15:00:55 2008 Nobuyoshi Nakada * configure.in: Remove wrong assumptions about Cygwin. a patch from diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb index 2b66adeb9..88b507846 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 f88b84e6f..645c8c280 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-11" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080611 -#define RUBY_PATCHLEVEL 168 +#define RUBY_PATCHLEVEL 169 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit