Re: [Python-Dev] cpython: Revert unintended merge

2016-12-03 Thread Steve Dower
On 03Dec2016 1519, Martin Panter wrote: This change comes from Matthias (Doko), and was originally only in the 3.5 branch: https://hg.python.org/cpython/rev/14c80065c36e I presume it was left unmerged until there is a branch for 3.6.1 to merge into. So Steve, when you did your first 3.5 → 3.6

Re: [Python-Dev] cpython: Revert unintended merge

2016-12-03 Thread Matthias Klose
On 04.12.2016 00:19, Martin Panter wrote: > On 3 December 2016 at 22:15, Steve Dower wrote: >> On 03Dec2016 1312, Serhiy Storchaka wrote: >>> >>> On 03.12.16 22:13, steve.dower wrote: https://hg.python.org/cpython/rev/a60767015bed changeset:

Re: [Python-Dev] cpython: Revert unintended merge

2016-12-03 Thread Martin Panter
On 3 December 2016 at 22:15, Steve Dower wrote: > On 03Dec2016 1312, Serhiy Storchaka wrote: >> >> On 03.12.16 22:13, steve.dower wrote: >>> >>> https://hg.python.org/cpython/rev/a60767015bed >>> changeset: 105436:a60767015bed >>> user:Steve Dower

Re: [Python-Dev] cpython: Revert unintended merge

2016-12-03 Thread Steve Dower
On 03Dec2016 1312, Serhiy Storchaka wrote: On 03.12.16 22:13, steve.dower wrote: https://hg.python.org/cpython/rev/a60767015bed changeset: 105436:a60767015bed user:Steve Dower date:Sat Dec 03 12:12:23 2016 -0800 summary: Revert unintended merge

Re: [Python-Dev] cpython: Revert unintended merge

2016-12-03 Thread Serhiy Storchaka
On 03.12.16 22:13, steve.dower wrote: https://hg.python.org/cpython/rev/a60767015bed changeset: 105436:a60767015bed user:Steve Dower date:Sat Dec 03 12:12:23 2016 -0800 summary: Revert unintended merge I suppose it should be reverted in the 3.6