[Checkins] [zopefoundation/ZEO] 870560: Python 2.7 support!!!

[GitHub]

  Branch: refs/heads/asyncio
  Home:   https://github.com/zopefoundation/ZEO
  Commit: 8705602cf9b601792e0da2a481f2dc4fd483d03d
      https://github.com/zopefoundation/ZEO/commit/8705602cf9b601792e0da2a481f2dc4fd483d03d
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-03 (Sun, 03 Jul 2016)

  Changed paths:
    M .travis.yml
    M setup.py
    M src/ZEO/StorageServer.py
    M src/ZEO/asyncio/base.py
    M src/ZEO/asyncio/client.py
    M src/ZEO/asyncio/mtacceptor.py
    M src/ZEO/asyncio/server.py
    M src/ZEO/asyncio/testing.py
    M src/ZEO/asyncio/tests.py
    M src/ZEO/tests/protocols.test
    M src/ZEO/tests/testZEO.py
    M src/ZEO/tests/testZEO2.py

  Log Message:
  -----------
  Python 2.7 support!!!

And holy crap, uncommented some tests that I'd commented early while
working on asyncio and forgot to uncomment before checking in.


  Commit: 6fbe47ebe5385732c4d516b339d4f36ad0f2efac
      https://github.com/zopefoundation/ZEO/commit/6fbe47ebe5385732c4d516b339d4f36ad0f2efac
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M setup.py
    M src/ZEO/ClientStorage.py
    M src/ZEO/StorageServer.py
    M src/ZEO/TransactionBuffer.py
    M src/ZEO/asyncio/server.py
    M src/ZEO/asyncio/tests.py
    M src/ZEO/cache.py
    M src/ZEO/interfaces.py
    M src/ZEO/tests/ConnectionTests.py
    M src/ZEO/tests/forker.py
    M src/ZEO/tests/protocols.test
    M src/ZEO/tests/testZEO.py
    M src/ZEO/tests/testZEO2.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/asyncio' into py2

Conflicts:
	setup.py
	src/ZEO/tests/protocols.test


  Commit: c8873c33f005ab154c15d3a5308d7781c53b6011
      https://github.com/zopefoundation/ZEO/commit/c8873c33f005ab154c15d3a5308d7781c53b6011
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M setup.py
    M src/ZEO/ClientStorage.py
    M src/ZEO/StorageServer.py
    M src/ZEO/TransactionBuffer.py
    M src/ZEO/asyncio/__init__.py
    M src/ZEO/asyncio/base.py
    M src/ZEO/asyncio/testing.py
    M src/ZEO/runzeo.py
    M src/ZEO/server.xml
    M src/ZEO/tests/CommitLockTests.py
    M src/ZEO/tests/ConnectionTests.py
    M src/ZEO/tests/InvalidationTests.py
    M src/ZEO/tests/forker.py
    M src/ZEO/tests/testConversionSupport.py
    M src/ZEO/tests/testZEO.py
    A src/ZEO/tests/test_client_side_conflict_resolution.py
    A src/ZEO/tests/utils.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/asyncio' into py2

Conflicts:
	setup.py
	src/ZEO/asyncio/base.py


  Commit: d9b4573315ff39339eb7c5347739597eabf220f5
      https://github.com/zopefoundation/ZEO/commit/d9b4573315ff39339eb7c5347739597eabf220f5
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M src/ZEO/tests/testZEO.py

  Log Message:
  -----------
  Update for new commit protocol


  Commit: b86957c1f499a448b4e8ebd39fc356b9f7496dd7
      https://github.com/zopefoundation/ZEO/commit/b86957c1f499a448b4e8ebd39fc356b9f7496dd7
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M src/ZEO/tests/testZEO2.py

  Log Message:
  -----------
  Python 6ify


  Commit: 7de0a7870f5ed2afa07eaefce7b13fbf26ce6dc7
      https://github.com/zopefoundation/ZEO/commit/7de0a7870f5ed2afa07eaefce7b13fbf26ce6dc7
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  include python 2.7


  Commit: c0b96879cf65d7fa89e09e258c2d07b92f7e2811
      https://github.com/zopefoundation/ZEO/commit/c0b96879cf65d7fa89e09e258c2d07b92f7e2811
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M src/ZEO/tests/testZEO.py

  Log Message:
  -----------
  Stop using get_port in another place, for faster more reliable tests


  Commit: 9b421915c74433dfd743de619d66d20e7c28a846
      https://github.com/zopefoundation/ZEO/commit/9b421915c74433dfd743de619d66d20e7c28a846
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M src/ZEO/tests/testConfig.py
    M src/ZEO/tests/testssl.py

  Log Message:
  -----------
  Mock asyncio in mockiavellian tests


  Commit: edb198a0a6cf5d4ba161656ecbc24237b6cf6d24
      https://github.com/zopefoundation/ZEO/commit/edb198a0a6cf5d4ba161656ecbc24237b6cf6d24
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M src/ZEO/asyncio/server.py

  Log Message:
  -----------
  fix asyncio.async call


  Commit: b4ecd30b3c0aeedeec3e98e65ae00705a542ca6c
      https://github.com/zopefoundation/ZEO/commit/b4ecd30b3c0aeedeec3e98e65ae00705a542ca6c
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M src/ZEO/asyncio/server.py

  Log Message:
  -----------
  simplify acceptor setup logic

After reading run_until_complete doc :)


  Commit: 88c596316ff9ba00d2d4563f871dc3866611aa5a
      https://github.com/zopefoundation/ZEO/commit/88c596316ff9ba00d2d4563f871dc3866611aa5a
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M src/ZEO/asyncio/client.py
    M src/ZEO/asyncio/server.py

  Log Message:
  -----------
  No need to call set_event_loop, as we carry loops around


  Commit: 694ff8e754127a7da29067f5add9a596d0980134
      https://github.com/zopefoundation/ZEO/commit/694ff8e754127a7da29067f5add9a596d0980134
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M src/ZEO/tests/forker.py

  Log Message:
  -----------
  better debugging of server startup.


  Commit: 9b8cfe9ebbd58a2c5411ca7907f2d3f6e933d937
      https://github.com/zopefoundation/ZEO/commit/9b8cfe9ebbd58a2c5411ca7907f2d3f6e933d937
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M setup.py
    M src/ZEO/asyncio/__init__.py

  Log Message:
  -----------
  Give up pn uvloop, for now. whimper


  Commit: 1ce6fd78c8eff4b85aea3156432a6102cf06801c
      https://github.com/zopefoundation/ZEO/commit/1ce6fd78c8eff4b85aea3156432a6102cf06801c
  Author: Jim Fulton <jim at jimfulton.info>
  Date:   2016-07-08 (Fri, 08 Jul 2016)

  Changed paths:
    M .travis.yml
    M setup.py
    M src/ZEO/StorageServer.py
    M src/ZEO/asyncio/__init__.py
    M src/ZEO/asyncio/base.py
    M src/ZEO/asyncio/client.py
    M src/ZEO/asyncio/mtacceptor.py
    M src/ZEO/asyncio/server.py
    M src/ZEO/asyncio/testing.py
    M src/ZEO/asyncio/tests.py
    M src/ZEO/tests/forker.py
    M src/ZEO/tests/protocols.test
    M src/ZEO/tests/testConfig.py
    M src/ZEO/tests/testZEO.py
    M src/ZEO/tests/testZEO2.py
    M src/ZEO/tests/testssl.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #41 from zopefoundation/py2

Python 2 support


Compare: https://github.com/zopefoundation/ZEO/compare/29bf7bc0e97d...1ce6fd78c8ef