I doubt the VCS can help here. I think the only sane way of dealing with this is to wrap said changes in feature flags, e.g. if PYTHON34_SSL: On Dec 15, 2014, at 2:01 AM, Amaury Forgeot d'Arc <amauryfa@gmail.com> wrote:

I suspect that some 2.7.9 changes should not go in 3.2, but are only compatible with a 3.3 or 3.4 stdlib... Is there a way to skip the merge so these changes directly go to the 3.3 branch?

2014-12-14 22:15 GMT+01:00 Alex Gaynor <alex.gaynor@gmail.com>: Hey all,

Earlier today I created the 2.7.9 branch, with the copy of the 2.7.9 stdlib.

http://buildbot.pypy.org/summary?branch=stdlib-2.7.9 is the branch summary.

It's no surprise, the biggest work to be done is for the ssl module, 2.7.9 contains a complete backport of 3.4's ssl module.

We have up through 3.2s version of the ssl module implemented on the py3k branch. I'd like some feedback from folks on how you think we should best handle finishing the 2.7.9 work.

Should I copy the work from py3k, finish anything missing, and then when we get to python 3.4 on the py3k branch the work is just "already done"? Something else?

Feedback please! Alex

_______________________________________________ pypy-dev mailing list pypy-dev@python.org https://mail.python.org/mailman/listinfo/pypy-dev

-- Amaury Forgeot d'Arc _______________________________________________ pypy-dev mailing list pypy-dev@python.org https://mail.python.org/mailman/listinfo/pypy-dev

-- Philip Jenvey

I doubt the VCS can help here. I think the only sane way of dealing with this is to wrap said changes in feature flags, e.g. if PYTHON34_SSL: On Dec 15, 2014, at 2:01 AM, Amaury Forgeot d'Arc <amauryfa@gmail.com> wrote:

I suspect that some 2.7.9 changes should not go in 3.2, but are only compatible with a 3.3 or 3.4 stdlib... Is there a way to skip the merge so these changes directly go to the 3.3 branch?

2014-12-14 22:15 GMT+01:00 Alex Gaynor <alex.gaynor@gmail.com>: Hey all,

Earlier today I created the 2.7.9 branch, with the copy of the 2.7.9 stdlib.

http://buildbot.pypy.org/summary?branch=stdlib-2.7.9 is the branch summary.

It's no surprise, the biggest work to be done is for the ssl module, 2.7.9 contains a complete backport of 3.4's ssl module.

We have up through 3.2s version of the ssl module implemented on the py3k branch. I'd like some feedback from folks on how you think we should best handle finishing the 2.7.9 work.

Should I copy the work from py3k, finish anything missing, and then when we get to python 3.4 on the py3k branch the work is just "already done"? Something else?

Feedback please! Alex

_______________________________________________ pypy-dev mailing list pypy-dev@python.org https://mail.python.org/mailman/listinfo/pypy-dev

-- Amaury Forgeot d'Arc _______________________________________________ pypy-dev mailing list pypy-dev@python.org https://mail.python.org/mailman/listinfo/pypy-dev

-- Philip Jenvey