[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]

On Mon, Mar 22, 2010 at 3:12 PM, Ezio Melotti <ezio.melotti at gmail.com> wrote:
> On 22/03/2010 23.25, Collin Winter wrote:
>>
>> 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
>>
>
> Your changes were in "already-mixed" parts (the lines before were
> using spaces and the lines after tabs), so it's not your fault.
> I was going to fix it but there are about 500 lines that use tabs
> and 50 that use spaces (in the _PyCode_CheckLineNumber function).
> So, there are 4 possible solutions:
> 1) leave it as it is;
> 2) fix only the few mixed parts (lines 105, 316-7);
> 3) convert _PyCode_CheckLineNumber to tabs;
> 4) convert everything else to spaces.

I favor #4.