summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-11 06:22:07 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-11 06:22:07 (GMT)
commit78fa719573070e4d8c7cba1b1cd055f4cf2f4da7 (patch)
treeda7ab8b2e540bf655ef3e06c4025be94fa20563d
parentd9e5857dfeca19ab0c5300b7b192dd9ade7f3246 (diff)
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17094 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/uri/generic.rb3
-rw-r--r--version.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 51c46b6..9a315ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 11 15:06:00 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]
+
Wed Jun 11 14:58:49 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in: Remove wrong assumptions about Cygwin. a patch from
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
index b7a4cf6..1bc90cb 100644
--- a/lib/uri/generic.rb
+++ b/lib/uri/generic.rb
@@ -1100,8 +1100,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 db3d3f5..53b6bb7 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-11"
#define RUBY_VERSION_CODE 185
#define RUBY_RELEASE_CODE 20080611
-#define RUBY_PATCHLEVEL 167
+#define RUBY_PATCHLEVEL 168
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8