Update to 3.6 type annotations and remove 3.5 compatibility

Author: bryanforbes

.travis.yml

@@ -3,7 +3,7 @@ language: generic
 env:
 global:
  - PYMODULE=asyncpg
- - RELEASE_PYTHON_VERSIONS="3.5 3.6 3.7 3.8"
+ - RELEASE_PYTHON_VERSIONS="3.6 3.7 3.8"
 
  - S3_UPLOAD_USERNAME=oss-ci-bot
  - S3_UPLOAD_BUCKET=magicstack-oss-releases
@@ -93,20 +93,6 @@ jobs:
 
 # Do a full test run on the latest supported version of PostgreSQL
 # on each supported version of Python.
- - name: "Test py 3.5"
-os: linux
-dist: focal
-language: python
-python: "3.5"
-env: BUILD=tests PGVERSION=12
-addons:
-apt:
-sources:
- - sourceline: 'deb https://apt.postgresql.org/pub/repos/apt/ focal-pgdg main'
-key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc'
-packages:
- - postgresql-12
-
  - name: "Test py 3.6"
 os: linux
 dist: focal
@@ -195,10 +181,6 @@ jobs:
 addons:
 postgresql: "12"
 
- - name: "OSX py 3.5"
-os: osx
-env: BUILD=tests,wheels PYTHON_VERSION=3.5.9 PGVERSION=12
-
  - name: "OSX py 3.6"
 os: osx
 env: BUILD=tests,wheels PYTHON_VERSION=3.6.10 PGVERSION=12

asyncpg/cluster.py

@@ -31,10 +31,9 @@
 from . importtypes
 
 
-_ConnectionSpec=typing_extensions.TypedDict('_ConnectionSpec',{
-'host': str,
-'port': str
-})
+class_ConnectionSpec(typing_extensions.TypedDict):
+host: str
+port: str
 
 
 _system=platform.uname().system
@@ -53,7 +52,7 @@ def find_available_port(port_range: typing.Tuple[int, int] = (49152, 65535),
 max_tries: int=1000) ->typing.Optional[int]:
 low, high=port_range
 
-port=low# type: typing.Optional[int]
+port: typing.Optional[int]=low
 try_no=0
 
 whiletry_no<max_tries:
@@ -85,11 +84,11 @@ def __init__(self, data_dir: str, *,
 self._data_dir=data_dir
 self._pg_config_path=pg_config_path
 self._pg_bin_dir=os.environ.get('PGINSTALLATION')
-self._pg_ctl=None# type: typing.Optional[str]
-self._daemon_pid=None# type: typing.Optional[int]
-self._daemon_process=None# type: typing.Optional[subprocess.Popen[bytes]]  # noqa: E501
-self._connection_addr=None# type: typing.Optional[_ConnectionSpec]
-self._connection_spec_override=None# type: typing.Optional[_ConnectionSpec]  # noqa: E501
+self._pg_ctl: typing.Optional[str]=None
+self._daemon_pid: typing.Optional[int]=None
+self._daemon_process: typing.Optional[subprocess.Popen[bytes]] =None
+self._connection_addr: typing.Optional[_ConnectionSpec]=None
+self._connection_spec_override: typing.Optional[_ConnectionSpec] =None
 
 defget_pg_version(self) ->'types.ServerVersion':
 returnself._pg_version
@@ -132,7 +131,7 @@ def get_status(self) -> str:
 asyncdefconnect(self,
 loop: typing.Optional[asyncio.AbstractEventLoop] =None,
 **kwargs: typing.Any) ->'connection.Connection':
-conn_info=self.get_connection_spec() # type: typing.Optional[typing.Any]  # noqa: E501
+conn_info: typing.Optional[typing.Any] =self.get_connection_spec()
 conn_info.update(kwargs) # type: ignore[union-attr]
 returnawaitasyncpg.connect(loop=loop, **conn_info) # type: ignore[misc] # noqa: E501
 
@@ -215,7 +214,7 @@ def start(self, wait: int = 60, *,
 # is not permitted and there is no easy way to drop
 # privileges.
 ifos.getenv('ASYNCPG_DEBUG_SERVER'):
-stdout=sys.stdout# type: typing.Union[int, typing.TextIO]
+stdout: typing.Union[int, typing.TextIO]=sys.stdout
 else:
 stdout=subprocess.DEVNULL
 

asyncpg/compat.py

@@ -6,78 +6,17 @@
 
 
 importasyncio
-importfunctools
-importos
 importpathlib
 importplatform
 importsys
 importtyping
-importtyping_extensions
 
 
-_T_co=typing.TypeVar('_T_co', covariant=True)
-_F=typing.TypeVar('_F', bound=typing.Callable[..., typing.Any])
-_F_35=typing.TypeVar('_F_35', bound=typing.Callable[
- ...,
-typing.Coroutine[typing.Any, typing.Any, typing.Any]
-])
-
 PY_36=sys.version_info>= (3, 6)
 PY_37=sys.version_info>= (3, 7)
 SYSTEM=platform.uname().system
 
 
-ifsys.version_info< (3, 5, 2):
-defaiter_compat(func: _F) ->_F_35:
-@functools.wraps(func)
-asyncdefwrapper(self: typing.Any) ->typing.Any:
-returnfunc(self)
-returntyping.cast(_F_35, wrapper)
-else:
-defaiter_compat(func: _F) ->_F: # type: ignore[misc]
-returnfunc
-
-
-classPathLike(typing_extensions.Protocol[_T_co]):
-def__fspath__(self) ->_T_co:
- ...
-
-
-ifsys.version_info>= (3, 6):
-fspath=os.fspath
-else:
-@typing.overload
-deffspath(path: str) ->str:
- ...
-
-@typing.overload
-deffspath(path: bytes) ->bytes:
- ...
-
-@typing.overload
-deffspath(path: PathLike[typing.AnyStr]) ->typing.AnyStr:
- ...
-
-deffspath(path: typing.Any) ->typing.Any:
-fsp=getattr(path, '__fspath__', None)
-iffspisnotNoneandcallable(fsp):
-path=fsp()
-ifnotisinstance(path, (str, bytes)):
-raiseTypeError(
-'expected{}() to return str or bytes, not{}'.format(
-fsp.__qualname__, type(path).__name__
- ))
-returnpath
-elifisinstance(path, (str, bytes)):
-returnpath
-else:
-raiseTypeError(
-'expected str, bytes or path-like object, not{}'.format(
-type(path).__name__
- )
- )
-
-
 ifSYSTEM=='Windows':
 importctypes.wintypes
 

asyncpg/connect_utils.py

@@ -37,27 +37,22 @@
 HostType=typing.Union[typing.List[str], str]
 PortType=typing.Union[typing.List[int], int]
 
-_ConnectionParameters=typing.NamedTuple(
-'ConnectionParameters',
- [
- ('user', str),
- ('password', typing.Optional[str]),
- ('database', str),
- ('ssl', typing.Optional[SSLType]),
- ('ssl_is_advisory', typing.Optional[bool]),
- ('connect_timeout', typing.Optional[float]),
- ('server_settings', typing.Optional[typing.Dict[str, str]])
- ])
-
-
-_ClientConfiguration=typing.NamedTuple(
-'ConnectionConfiguration',
- [
- ('command_timeout', typing.Optional[float]),
- ('statement_cache_size', int),
- ('max_cached_statement_lifetime', int),
- ('max_cacheable_statement_size', int),
- ])
+
+class_ConnectionParameters(typing.NamedTuple):
+user: str
+password: typing.Optional[str]
+database: str
+ssl: typing.Optional[SSLType]
+ssl_is_advisory: typing.Optional[bool]
+connect_timeout: typing.Optional[float]
+server_settings: typing.Optional[typing.Dict[str, str]]
+
+
+class_ClientConfiguration(typing.NamedTuple):
+command_timeout: typing.Optional[float]
+statement_cache_size: int
+max_cached_statement_lifetime: int
+max_cacheable_statement_size: int
 
 
 _system=platform.uname().system
@@ -175,15 +170,16 @@ def _parse_hostlist(hostlist: str,
 else:
 hostspecs= [hostlist]
 
-hosts= [] # type: typing.List[str]
-hostlist_ports= [] # type: typing.List[int]
-ports=None# type: typing.Optional[typing.List[int]]
+hosts: typing.List[str] = []
+hostlist_ports: typing.List[int] = []
+ports: typing.Optional[typing.List[int]]=None
 
 ifnotport:
 portspec=os.environ.get('PGPORT')
 ifportspec:
 if','inportspec:
-temp_port= [int(p) forpinportspec.split(',')] # type: typing.Union[typing.List[int], int] # noqa: E501
+temp_port: typing.Union[typing.List[int], int] = [
+int(p) forpinportspec.split(',')]
 else:
 temp_port=int(portspec)
 else:
@@ -274,7 +270,7 @@ def _parse_connect_dsn_and_args(*, dsn: typing.Optional[str],
 
 ifparsed.query:
 query=urllib.parse.parse_qs(parsed.query, strict_parsing=True)
-query_str={} # type: typing.Dict[str, str]
+query_str: typing.Dict[str, str]={}
 forkey, valinquery.items():
 ifisinstance(val, list):
 query_str[key] =val[-1]
@@ -404,7 +400,7 @@ def _parse_connect_dsn_and_args(*, dsn: typing.Optional[str],
 database=database, user=user,
 passfile=passfile) # type: ignore[arg-type]
 
-addrs= [] # type: typing.List[AddrType]
+addrs: typing.List[AddrType] = []
 forh, pinzip(host, port):
 ifh.startswith('/'):
 # UNIX socket name
@@ -726,7 +722,7 @@ async def _connect(*, loop: typing.Optional[asyncio.AbstractEventLoop],
 
 addrs, params, config=_parse_connect_arguments(timeout=timeout, **kwargs)
 
-last_error=None# type: typing.Optional[BaseException]
+last_error: typing.Optional[BaseException]=None
 addr=None
 foraddrinaddrs:
 before=time.monotonic()