From ef5450b5033d35a804bd4f7374253d9bf18997ae Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 27 Sep 2009 04:08:31 +0000
Subject: * lib/pp.rb (PP:ObjectMixin#pretty_print): delegates has no inspect  
 method.  [ruby-core:25804]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25122 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/pp.rb | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pp.rb b/lib/pp.rb
index a71ce9db3..2804ecd11 100644
--- a/lib/pp.rb
+++ b/lib/pp.rb
@@ -283,9 +283,23 @@ class PP < PrettyPrint
     # This module provides predefined #pretty_print methods for some of
     # the most commonly used built-in classes for convenience.
     def pretty_print(q)
-      if /\(Kernel\)#/ !~ Object.instance_method(:method).bind(self).call(:inspect).inspect
+      method_method = Object.instance_method(:method).bind(self)
+      begin
+        inspect_method = method_method.call(:inspect)
+      rescue NameError
+      end
+      begin
+        to_s_method = method_method.call(:to_s)
+      rescue NameError
+      end
+      if inspect_method && /\(Kernel\)#/ !~ inspect_method.inspect
+        q.text self.inspect
+      elsif !inspect_method && self.respond_to?(:inspect)
         q.text self.inspect
-      elsif /\(Kernel\)#/ !~ Object.instance_method(:method).bind(self).call(:to_s).inspect && instance_variables.empty?
+      elsif to_s_method && /\(Kernel\)#/ !~ to_s_method.inspect &&
+            instance_variables.empty?
+        q.text self.to_s
+      elsif !to_s_method && self.respond_to?(:to_s)
         q.text self.to_s
       else
         q.pp_object(self)
-- 
cgit