[MERGE] lsprof branch

[Robey Pointer]

On 22 Jun 2006, at 11:58, John Arbash Meinel wrote:

> Robey Pointer wrote:
>>
>> On 20 Jun 2006, at 11:49, John Arbash Meinel wrote:
>>
>>> Looking at my svn branch of lsprof.py, it has the indenting that I
>>> switched to. Where 'if e.calls'  is on the same level as 'if not
>>> isinstance'. That was the major difference between the bzr one  
>>> and the
>>> lsprof.py one.
>>
>> If this is what the lsprof maintainer did, then they must have a  
>> reason,
>> so we should probably do it too.  I just tried it and it seems to  
>> work
>> fine.
>>
>> I wonder if there are any other changes they've made?
>>
>
> I didn't see any other major changes. I think there were a couple  
> small
> things.
> They changed 'p.enable(subcalls=True)' to
> 'p.enable(subcalls=True, builtins=True)'
>
> Though it seems builtins default to True, since we are seeing them.
>
> We changed 'profile()' so that it returns the value of the function,
> rather than expecting no return.
> And then we changed from 'sys.modules.items()' to  
> 'sys.modules.iteritems()'.
>
> So maybe we want to add the 'builtins=True' call.

I just added and pushed that, in the interest of getting this branch  
landed. :)

robey