Fixes in ?? introspection for new-style classes, as well as closing an old bug on traceback computations that appears occasionally

IPython/OInspect.py

@@ -6,7 +6,7 b' Uses syntax highlighting for presenting the various information elements.'
 Similar in spirit to the inspect module, but all calls take a name argument to
 reference the name under which an object is being read.
 
-$Id: OInspect.py 2463 2007-06-27 22:51:16Z vivainio $
+$Id: OInspect.py 2480 2007-07-06 19:33:43Z fperez $
 """
 
 #*****************************************************************************
@@ -150,7 +150,7 b' def getsource(obj,is_binary=False):'
 
     - is_binary: whether the object is known to come from a binary source.
     This implementation will skip returning any output for binary objects, but
-    custom extractors may know how to meaninfully process them."""
+    custom extractors may know how to meaningfully process them."""
     
     if is_binary:
         return None
@@ -234,10 +234,12 b' class Inspector:'
             return
 
         header = ''
-        if type(obj) is types.ClassType:
+
+        if inspect.isclass(obj):
             header = self.__head('Class constructor information:\n')
             obj = obj.__init__
-        elif type(obj) is types.InstanceType:
+        elif type(obj) is types.InstanceType or \
+             isinstance(obj,object):
             obj = obj.__call__
 
         output = self.__getdef(obj,oname)
@@ -252,18 +254,19 b' class Inspector:'
         Optional:
         -formatter: a function to run the docstring through for specially
         formatted docstrings."""
-        
+
         head = self.__head  # so that itpl can find it even if private
         ds = getdoc(obj)
         if formatter:
             ds = formatter(ds)
-        if type(obj) is types.ClassType:
+        if inspect.isclass(obj):
             init_ds = getdoc(obj.__init__)
             output = itpl('$head("Class Docstring:")\n'
                           '$indent(ds)\n'
                           '$head("Constructor Docstring"):\n'
                           '$indent(init_ds)')
-        elif type(obj) is types.InstanceType and hasattr(obj,'__call__'):
+        elif (type(obj) is types.InstanceType or isinstance(obj,object)) \
+                 and hasattr(obj,'__call__'):
             call_ds = getdoc(obj.__call__)
             if call_ds:
                 output = itpl('$head("Class Docstring:")\n$indent(ds)\n'
@@ -438,7 +441,7 b' class Inspector:'
                             + indent(ds))
 
         # Constructor docstring for classes
-        if obj_type is types.ClassType:
+        if inspect.isclass(obj):
             # reconstruct the function definition and print it:
             try:
                 obj_init =  obj.__init__
@@ -455,7 +458,8 b' class Inspector:'
                 if init_ds:
                     out.writeln(header('Docstring:\n') + indent(init_ds))
         # and class docstring for instances:
-        elif obj_type is types.InstanceType:
+        elif obj_type is types.InstanceType or \
+                 isinstance(obj,object):
 
             # First, check whether the instance docstring is identical to the
             # class one, and print it separately if they don't coincide.  In

IPython/ultraTB.py

@@ -60,7 +60,7 b' You can implement other color schemes easily, the syntax is fairly'
 self-explanatory. Please send back new schemes you develop to the author for
 possible inclusion in future releases.
 
-$Id: ultraTB.py 2419 2007-06-01 07:31:42Z fperez $"""
+$Id: ultraTB.py 2480 2007-07-06 19:33:43Z fperez $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001 Nathaniel Gray <[e-mail]>
@@ -81,6 +81,7 b' import keyword'
 import linecache
 import os
 import pydoc
+import re
 import string
 import sys
 import time
@@ -88,6 +89,11 b' import tokenize'
 import traceback
 import types
 
+# For purposes of monkeypatching inspect to fix a bug in it.
+from inspect import getsourcefile, getfile, getmodule,\
+     ismodule,  isclass, ismethod, isfunction, istraceback, isframe, iscode
+
+
 # IPython's own modules
 # Modified pdb which doesn't damage IPython's readline handling
 from IPython import Debugger, PyColorize
@@ -117,6 +123,79 b' def inspect_error():'
     error('Internal Python error in the inspect module.\n'
           'Below is the traceback from this internal error.\n')
 
+
+def findsource(object):
+    """Return the entire source file and starting line number for an object.
+
+    The argument may be a module, class, method, function, traceback, frame,
+    or code object.  The source code is returned as a list of all the lines
+    in the file and the line number indexes a line in that list.  An IOError
+    is raised if the source code cannot be retrieved.
+
+    FIXED version with which we monkeypatch the stdlib to work around a bug."""
+
+    file = getsourcefile(object) or getfile(object)
+    module = getmodule(object, file)
+    if module:
+        lines = linecache.getlines(file, module.__dict__)
+    else:
+        lines = linecache.getlines(file)
+    if not lines:
+        raise IOError('could not get source code')
+
+    if ismodule(object):
+        return lines, 0
+
+    if isclass(object):
+        name = object.__name__
+        pat = re.compile(r'^(\s*)class\s*' + name + r'\b')
+        # make some effort to find the best matching class definition:
+        # use the one with the least indentation, which is the one
+        # that's most probably not inside a function definition.
+        candidates = []
+        for i in range(len(lines)):
+            match = pat.match(lines[i])
+            if match:
+                # if it's at toplevel, it's already the best one
+                if lines[i][0] == 'c':
+                    return lines, i
+                # else add whitespace to candidate list
+                candidates.append((match.group(1), i))
+        if candidates:
+            # this will sort by whitespace, and by line number,
+            # less whitespace first
+            candidates.sort()
+            return lines, candidates[0][1]
+        else:
+            raise IOError('could not find class definition')
+
+    if ismethod(object):
+        object = object.im_func
+    if isfunction(object):
+        object = object.func_code
+    if istraceback(object):
+        object = object.tb_frame
+    if isframe(object):
+        object = object.f_code
+    if iscode(object):
+        if not hasattr(object, 'co_firstlineno'):
+            raise IOError('could not find function definition')
+        pat = re.compile(r'^(\s*def\s)|(.*(?<!\w)lambda(:|\s))|^(\s*@)')
+        pmatch = pat.match
+        # fperez - fix: sometimes, co_firstlineno can give a number larger than
+        # the length of lines, which causes an error.  Safeguard against that.
+        lnum = min(object.co_firstlineno,len(lines))-1
+        while lnum > 0:
+            if pmatch(lines[lnum]): break
+            lnum -= 1
+ 
+        return lines, lnum
+    raise IOError('could not find code object')
+
+# Monkeypatch inspect to apply our bugfix.  This code only works with py25
+if sys.version_info[:2] >= (2,5):
+    inspect.findsource = findsource
+
 def _fixed_getinnerframes(etb, context=1,tb_offset=0):
     import linecache
     LNUM_POS, LINES_POS, INDEX_POS =  2, 4, 5

doc/ChangeLog

@@ -1,3 +1,8 b''
[phone]  Fernando Perez  <[e-mail]>
+
+	* IPython/OInspect.py (Inspector.pinfo): Add support for new-style
+	classes in various inspector functions.
+
 2007-06-28  Ville Vainio  <[e-mail]>
 
 	* shadowns.py, iplib.py, ipapi.py, OInspect.py:
@@ -14,6 +19,11 b''
 
         * New generic inspect_object, called on obj? and obj??
 
[phone]  Fernando Perez  <[e-mail]>
+
+	* IPython/ultraTB.py (findsource): fix a problem with
+	inspect.getfile that can cause crashes during traceback construction.
+
 2007-06-14  Ville Vainio  <[e-mail]>
 
 	* iplib.py (handle_auto): Try to use ascii for printing "--->"