[Python-checkins] r79071 - in python/branches/py3k: Doc/library/weakref.rst Include/code.h Lib/test/test_code.py Lib/test/test_sys.py Misc/NEWS Objects/codeobject.c

[Collin Winter]

Hi Ezio,

On Mon, Mar 22, 2010 at 9:56 AM, Ezio Melotti <ezio.melotti at gmail.com> wrote:
> On 19/03/2010 0.46, collin.winter wrote:
>
>> Author: collin.winter
>> Date: Thu Mar 18 23:46:40 2010
>> New Revision: 79071
>>
>> Log:
>> Merged revisions 79060 via svnmerge from
>> svn+ssh://pythondev@svn.python.org/python/trunk
[snip]
> Hi,
> there are spaces mixed with tabs in codeobjects.c.
> The module uses mainly tabs except the _PyCode_CheckLineNumber function
> that uses spaces. In a few other places they are mixed.

I don't believe I added any new conflicts, did I? I know there are
mixed usages in the functions I was updating, but I think those should
be normalized in a separate commit.

Collin