[pypy-commit] pypy stdlib-2.7.9: Resolved merge conflicts in test_ssl.py

Author: Alex Gaynor Branch: stdlib-2.7.9 Changeset: r74930:460cc2dd9310 Date: 2014-12-14 10:45 -0800 http://bitbucket.org/pypy/pypy/changeset/460cc2dd9310/ Log:Resolved merge conflicts in test_ssl.py diff --git a/lib-python/2.7/test/test_socket.py b/lib-python/2.7/test/test_socket.py --- a/

[pypy-commit] pypy stdlib-2.7.9: Resolved merge conflicts in test_ssl.py

Author: Alex Gaynor Branch: stdlib-2.7.9 Changeset: r74929:39a0aacf4e67 Date: 2014-12-14 10:43 -0800 http://bitbucket.org/pypy/pypy/changeset/39a0aacf4e67/ Log:Resolved merge conflicts in test_ssl.py diff --git a/lib-python/2.7/test/test_hash.py b/lib-python/2.7/test/test_hash.py --- a/lib-p

[pypy-commit] pypy stdlib-2.7.9: Resolved merge conflicts in test_ssl.py

Author: Alex Gaynor Branch: stdlib-2.7.9 Changeset: r74922:5eed2065b581 Date: 2014-12-14 10:40 -0800 http://bitbucket.org/pypy/pypy/changeset/5eed2065b581/ Log:Resolved merge conflicts in test_ssl.py diff --git a/lib-python/2.7/test/test_ssl.py b/lib-python/2.7/test/test_ssl.py --- a/lib-pyt