Fixes for 3.6 and 3.7

Author: bryanforbes

asyncpg/connect_utils.py

@@ -276,21 +276,20 @@ def _parse_hostlist(hostlist: str,
     return hosts, ports
 
 
-def _parse_tls_version(tls_version: str) -> ssl_module.TLSVersion:
-    if not hasattr(ssl_module, 'TLSVersion'):
-        raise ValueError(
-            "TLSVersion is not supported in this version of Python"
-        )
-    if tls_version.startswith('SSL'):
-        raise ValueError(
-            f"Unsupported TLS version: {tls_version}"
-        )
-    try:
-        return ssl_module.TLSVersion[tls_version.replace('.', '_')]
-    except KeyError:
-        raise ValueError(
-            f"No such TLS version: {tls_version}"
-        )
+if sys.version_info >= (3, 7):
+    def _parse_tls_version(tls_version: str) -> ssl_module.TLSVersion:
+        if tls_version.startswith('SSL'):
+            raise ValueError(
+                f"Unsupported TLS version: {tls_version}"
+            )
+        try:
+            return ssl_module.TLSVersion[
+                tls_version.replace('.', '_')
+            ]
+        except KeyError:
+            raise ValueError(
+                f"No such TLS version: {tls_version}"
+            )
 
 
 def _dot_postgresql_path(filename: str) -> pathlib.Path:
@@ -621,30 +620,33 @@ def _parse_connect_dsn_and_args(*, dsn: typing.Optional[str],
                     pass
 
             # OpenSSL 1.1.1 keylog file, copied from create_default_context()
-            if hasattr(ssl, 'keylog_filename'):
+            if sys.version_info >= (3, 8):
+                # Python 3.6 and 3.7 do not have keylog_filename
                 keylogfile = os.environ.get('SSLKEYLOGFILE')
                 if keylogfile and not sys.flags.ignore_environment:
                     ssl.keylog_filename = keylogfile
 
-            if ssl_min_protocol_version is None:
-                ssl_min_protocol_version = os.getenv('PGSSLMINPROTOCOLVERSION')
-            if ssl_min_protocol_version:
-                ssl.minimum_version = _parse_tls_version(
-                    ssl_min_protocol_version
-                )
-            else:
-                try:
-                    ssl.minimum_version = _parse_tls_version('TLSv1.2')
-                except ValueError:
-                    # Python 3.6 does not have ssl.TLSVersion
-                    pass
+            if sys.version_info >= (3, 7):
+                # Python 3.6 does not have TLSVersion
+                if ssl_min_protocol_version is None:
+                    ssl_min_protocol_version = os.getenv(
+                        'PGSSLMINPROTOCOLVERSION'
+                    )
+                if not ssl_min_protocol_version:
+                    ssl_min_protocol_version = 'TLSv1.2'
+                if ssl_min_protocol_version:
+                    ssl.minimum_version = _parse_tls_version(
+                        ssl_min_protocol_version
+                    )
 
-            if ssl_max_protocol_version is None:
-                ssl_max_protocol_version = os.getenv('PGSSLMAXPROTOCOLVERSION')
-            if ssl_max_protocol_version:
-                ssl.maximum_version = _parse_tls_version(
-                    ssl_max_protocol_version
-                )
+                if ssl_max_protocol_version is None:
+                    ssl_max_protocol_version = os.getenv(
+                        'PGSSLMAXPROTOCOLVERSION'
+                    )
+                if ssl_max_protocol_version:
+                    ssl.maximum_version = _parse_tls_version(
+                        ssl_max_protocol_version
+                    )
 
     elif ssl is True:
         ssl = ssl_module.create_default_context()

asyncpg/pool_connection_proxy.py

@@ -24,7 +24,7 @@
 
 class _PoolConnectionProxyMeta(type):
 
-    def __new__(mcls, name, bases, dct, *, wrap=False):
+    def __new__(mcls, name, bases, dct, *, wrap=False, **kwargs):
         if wrap:
             for attrname in dir(connection.Connection):
                 if attrname.startswith('_') or attrname in dct:
@@ -43,10 +43,6 @@ def __new__(mcls, name, bases, dct, *, wrap=False):
 
         return super().__new__(mcls, name, bases, dct)
 
-    def __init__(cls, name, bases, dct, *, wrap=False):
-        # Needed for Python 3.5 to handle `wrap` class keyword argument.
-        super().__init__(name, bases, dct)
-
     @staticmethod
     def _wrap_connection_method(meth_name):
         def call_con_method(self, *args, **kwargs):

asyncpg/protocol/protocol.pyi

@@ -36,7 +36,7 @@ from ..types import Type, Attribute
 
 _T = TypeVar("_T")
 _NoTimeoutType = NewType("_NoTimeoutType", object)
-_TimeoutType: TypeAlias = Union[float, None, _NoTimeoutType]
+_TimeoutType: TypeAlias = Union[float, None, _NoTimeoutType]  # noqa: Y015
 _Record = TypeVar("_Record", bound=Record)
 _OtherRecord = TypeVar("_OtherRecord", bound=Record)
 _PreparedStatementState = TypeVar(

mypy-plugin.ini

@@ -7,6 +7,3 @@ implicit_reexport = True
 
 [mypy-asyncpg._testbase.*]
 ignore_errors = True
-
-[mypy-importlib_metadata]
-ignore_missing_imports = True

mypy.ini

@@ -4,8 +4,8 @@ strict = True
 implicit_reexport = True
 # disallow_any_unimported = True
 
-[mypy-asyncpg._testbase.*]
+[mypy-asyncpg._testbase]
 ignore_errors = True
 
-[mypy-importlib_metadata]
-ignore_missing_imports = True
+[mypy-asyncpg._testbase.*]
+ignore_errors = True

setup.py

@@ -34,7 +34,7 @@
     # (example breakage: https://gitlab.com/pycqa/flake8/issues/427)
     'pycodestyle~=2.7.0',
     'flake8~=3.9.2',
-    'flake8-pyi>=22.1.0',
+    'flake8-pyi~=20.10.0',
     'uvloop>=0.15.3; platform_system != "Windows" and python_version >= "3.7"',
     'mypy>=0.931'
 ]