[Python-Dev] cpython (merge 3.4 -> default): Merge 3.4 (asyncio)

[Victor Stinner]

Hi,

The current workflow of asyncio is to first commit changes in the
external tulip project, then *copy* files to Python 3.4; to finish
with a merge from Python 3.4 into Python 3.5. To be complete, I also
merge tulip into trollius, but that's unrelated to your question :-)

To simplify the workflow, the code is currently exactly the same in
tulip, python 3.4 and python 3.5. It implies some tests on the Python
version in the code like "if _PY34: ...".

I would prefer to stick to this workflow. The code is still heavily
modified to fix issues.

The behaviour of generators in already tested in test_generators and
test_exceptions.

Victor

2015-02-02 20:41 GMT+01:00 Antoine Pitrou <solipsis at pitrou.net>:
> On Mon, 02 Feb 2015 17:38:10 +0000
> victor.stinner <python-checkins at python.org> wrote:
>
>> https://hg.python.org/cpython/rev/42b376c8cf60
>> changeset:   94465:42b376c8cf60
>> parent:      94463:0b3bc51341aa
>> parent:      94464:2cd6621a9fbc
>> user:        Victor Stinner <victor.stinner at gmail.com>
>> date:        Mon Feb 02 18:36:59 2015 +0100
>> summary:
>>   Merge 3.4 (asyncio)
>
> IMO it would be nice to keep the original code in the default branch,
> since it helps exercise generators.
>
> Regards
>
> Antoine.
>
>
> _______________________________________________
> Python-Dev mailing list
> Python-Dev at python.org
> https://mail.python.org/mailman/listinfo/python-dev
> Unsubscribe: https://mail.python.org/mailman/options/python-dev/victor.stinner%40gmail.com