ZEO.asyncio: switch to async/await style

.github/workflows/tests.yml

@@ -21,19 +21,14 @@ jobs:
         config:
         # [Python version, tox env]
         - ["3.9",   "lint"]
-        - ["2.7",   "py27"]
-        - ["3.5",   "py35"]
-        - ["3.6",   "py36"]
         - ["3.7",   "py37"]
         - ["3.8",   "py38"]
         - ["3.9",   "py39"]
         - ["3.10",  "py310"]
         - ["3.11",  "py311"]
-        - ["pypy-2.7", "pypy"]
         - ["pypy-3.7", "pypy3"]
         - ["3.9",   "docs"]
         - ["3.9",   "coverage"]
-        - ["2.7",   "py27-msgpack1"]
         - ["3.7",   "py37-msgpack1"]
         - ["3.7",   "py37-uvloop"]
         - ["3.7",   "py37-zodbmaster"]
@@ -74,7 +69,7 @@ jobs:
     - name: Coverage
       if: matrix.config[1] == 'coverage'
       run: |
-        pip install coveralls coverage-python-version
+        pip install coveralls
         coveralls --service=github
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.meta.toml

@@ -2,13 +2,12 @@
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [meta]
 template = "pure-python"
-commit-id = "200573eb414d2228d463da3de7d71a6d6335a704"
+commit-id = "78e0868c"
 
 [python]
 with-windows = false
 with-pypy = true
 with-future-python = false
-with-legacy-python = true
 with-docs = true
 with-sphinx-doctests = false
 with-macos = false
@@ -27,10 +26,19 @@ testenv-deps = [
     "uvloop: uvloop",
     ]
 testenv-setenv = [
-    "!py27-!pypy: PYTHONWARNINGS=ignore::ResourceWarning",
     "msgpack1: ZEO_MSGPACK=1",
     ]
 
+[flake8]
+additional-config = [
+    "# E501 line too long",
+    "# F401 unused import",
+    "per-file-ignores =",
+    "    src/ZEO/tests/test_cache.py: E501",
+    "    src/ZEO/_compat.py: F401",
+    "    src/ZEO/asyncio/compat.py: F401",
+    ]
+
 [coverage]
 fail-under = 53
 
@@ -41,6 +49,7 @@ additional-rules = [
     "include log.ini",
     "recursive-include src *.csr",
     "recursive-include src *.pem",
+    "recursive-include src *.pyx",
     "recursive-include src *.rst",
     "recursive-include src *.test",
     "recursive-include src *.txt",
@@ -49,7 +58,6 @@ additional-rules = [
 
 [github-actions]
 additional-config = [
-    "- [\"2.7\",   \"py27-msgpack1\"]",
     "- [\"3.7\",   \"py37-msgpack1\"]",
     "- [\"3.7\",   \"py37-uvloop\"]",
     "- [\"3.7\",   \"py37-zodbmaster\"]",

CHANGES.rst

@@ -4,13 +4,16 @@ Changelog
 6.0.0 (unreleased)
 ------------------
 
+- Drop support for Python 2.7, 3.5, 3.6.
 
-5.4.0 (2023-01-18)
+- Switch to using `async/await` directly instead of `@coroutine/yield`
+
+
+5.4.0 (unreleased)
 ------------------
 
 - Reimplement and streamline the ``asyncio`` part of the ``ClientStorage``
   implementation:
-
    - switch from futures with explicit callbacks to `async/await`-like style
    - use standard ``asyncio`` features to implement timeouts
    - redesign the API of the class implementing the ZEO client protocol

MANIFEST.in

@@ -12,12 +12,12 @@ recursive-include docs *.txt
 recursive-include docs Makefile
 
 recursive-include src *.py
-recursive-include src *.pyx
 include *.py
 include COPYING
 include log.ini
 recursive-include src *.csr
 recursive-include src *.pem
+recursive-include src *.pyx
 recursive-include src *.rst
 recursive-include src *.test
 recursive-include src *.txt

setup.cfg

@@ -1,10 +1,16 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [bdist_wheel]
-universal = 1
+universal = 0
 
 [flake8]
 doctests = 1
+# E501 line too long
+# F401 unused import
+per-file-ignores =
+    src/ZEO/tests/test_cache.py: E501
+    src/ZEO/_compat.py: F401
+    src/ZEO/asyncio/compat.py: F401
 
 [check-manifest]
 ignore =
@@ -16,9 +22,9 @@ ignore =
 force_single_line = True
 combine_as_imports = True
 sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER
-known_third_party = six, docutils, pkg_resources
-known_zope =
-known_first_party =
+known_third_party =  six, docutils, pkg_resources
+known_zope = 
+known_first_party = 
 default_section = ZOPE
 line_length = 79
 lines_after_imports = 2

setup.py

@@ -18,7 +18,6 @@
 
 install_requires = [
     'ZODB >= 5.1.1',
-    'six',
     'transaction >= 2.0.3',
     'persistent >= 4.1.0',
     'zc.lockfile',
@@ -34,10 +33,8 @@
     'ZODB >= 5.5.1',
     'ZopeUndo',
     'zope.testing',
-    'manuel',
     'transaction',
-    'mock',
-    'msgpack < 1',
+    'msgpack',
     'zdaemon',
     'zope.testrunner',
 ]
@@ -64,11 +61,7 @@
       classifiers=[
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Zope Public License",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
@@ -91,10 +84,6 @@
           'msgpack': [
               'msgpack-python'
           ],
-          ':python_version == "2.7"': [
-              'futures',
-              'trollius',
-          ],
           'docs': [
               'Sphinx',
               'repoze.sphinx.autointerface',
@@ -111,5 +100,5 @@
       zeo-nagios = ZEO.nagios:main
       """,
       include_package_data=True,
-      python_requires='>=2.7.9,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*',
+      python_requires='>=3.7',
       )

src/ZEO/ClientStorage.py

@@ -25,6 +25,7 @@
 import stat
 import sys
 import threading
+from threading import get_ident
 import time
 import weakref
 from binascii import hexlify
@@ -37,10 +38,8 @@
 import ZODB.ConflictResolution
 import ZODB.interfaces
 import zope.interface
-import six
 
 from persistent.TimeStamp import TimeStamp
-from ZEO._compat import get_ident
 from ZEO._compat import WIN
 from ZEO.Exceptions import ClientDisconnected
 from ZEO.TransactionBuffer import TransactionBuffer
@@ -262,12 +261,12 @@ def __init__(self, addr, storage='1', cache_size=20 * MB,
 
         self.__name__ = name or str(addr)  # Standard convention for storages
 
-        if isinstance(addr, six.string_types):
+        if isinstance(addr, str):
             if WIN:
                 raise ValueError("Unix sockets are not available on Windows")
             addr = [addr]
         elif (isinstance(addr, tuple) and len(addr) == 2 and
-              isinstance(addr[0], six.string_types) and
+              isinstance(addr[0], str) and
               isinstance(addr[1], int)):
             addr = [addr]
 
@@ -401,7 +400,7 @@ def _check_blob_size(self, bytes=None):
             args=(self.blob_dir, target),
             name="%s zeo client check blob size thread" % self.__name__,
             )
-        check_blob_size_thread.setDaemon(True)
+        check_blob_size_thread.daemon = True
         check_blob_size_thread.start()
         self._check_blob_size_thread = check_blob_size_thread
 
@@ -412,7 +411,7 @@ def registerDB(self, db):
 
         The storage isn't really ready to use until after this call.
         """
-        super(ClientStorage, self).registerDB(db)
+        super().registerDB(db)
         self._db = db
 
     def is_connected(self, test=False):
@@ -493,7 +492,7 @@ def set_server_addr(self, addr):
             host = addr[0]
             try:
                 canonical, aliases, addrs = socket.gethostbyaddr(host)
-            except socket.error as err:
+            except OSError as err:
                 logger.debug("%s Error resolving host: %s (%s)",
                              self.__name__, host, err)
                 canonical = host
@@ -507,7 +506,7 @@ def sortKey(self):
         if self._server_addr is None:
             raise ClientDisconnected
         else:
-            return '%s:%s' % (self._storage, self._server_addr)
+            return f'{self._storage}:{self._server_addr}'
 
     def notify_disconnected(self):
         """Internal: notify that the server connection was terminated.
@@ -537,7 +536,7 @@ def getName(self):
         connected.
 
         """
-        return "%s (%s)" % (
+        return "{} ({})".format(
             self.__name__,
             self.is_connected() and "connected" or "disconnected")
 
@@ -805,7 +804,7 @@ def openCommittedBlobFile(self, oid, serial, blob=None):
                 return open(blob_filename, 'rb')
             else:
                 return ZODB.blob.BlobFile(blob_filename, 'r', blob)
-        except (IOError):
+        except (OSError):
             # The file got removed while we were opening.
             # Fall through and try again with the protection of the lock.
             pass
@@ -1131,7 +1130,7 @@ def server_status(self, timeout=None):
         return self._call('server_status', timeout=timeout)
 
 
-class TransactionIterator(object):
+class TransactionIterator:
 
     def __init__(self, storage, iid, *args):
         self._storage = storage
@@ -1183,7 +1182,7 @@ def __iter__(self):
         return self._storage._setup_iterator(RecordIterator, riid)
 
 
-class RecordIterator(object):
+class RecordIterator:
 
     def __init__(self, storage, riid):
         self._riid = riid
@@ -1209,7 +1208,7 @@ def __next__(self):
     next = __next__
 
 
-class BlobCacheLayout(object):
+class BlobCacheLayout:
 
     size = 997
 
@@ -1220,7 +1219,7 @@ def getBlobFilePath(self, oid, tid):
         base, rem = divmod(utils.u64(oid), self.size)
         return os.path.join(
             str(rem),
-            "%s.%s%s" % (base, hexlify(tid).decode('ascii'),
+            "{}.{}{}".format(base, hexlify(tid).decode('ascii'),
                          ZODB.blob.BLOB_SUFFIX)
             )
 
@@ -1382,7 +1381,7 @@ def open_cache(cache, var, client, storage, cache_size):
         if cache is None:
             if client:
                 cache = os.path.join(var or os.getcwd(),
-                                     "%s-%s.zec" % (client, storage))
+                                     f'{client}-{storage}.zec')
             else:
                 # ephemeral cache
                 return ClientCache(None, cache_size)