Use Final from typing_extensions and not compat

Author: bryanforbes

asyncpg/cluster.py

@@ -18,6 +18,7 @@
 import textwrap
 import time
 import typing
+import typing_extensions
 
 import asyncpg
 from asyncpg import compat
@@ -34,7 +35,7 @@ class _ConnectionSpec(compat.TypedDict):
     port: str
 
 
-_system: compat.Final = platform.uname().system
+_system: typing_extensions.Final = platform.uname().system
 
 if _system == 'Windows':
     def platform_exe(name: str) -> str:

asyncpg/compat.py

@@ -9,26 +9,25 @@
 import pathlib
 import sys
 import typing
+import typing_extensions
 
 
 if sys.version_info >= (3, 8):
     from typing import (
-        Final as Final,
         Literal as Literal,
         Protocol as Protocol,
         TypedDict as TypedDict
     )
 else:
     from typing_extensions import (  # noqa: F401
-        Final as Final,
         Literal as Literal,
         Protocol as Protocol,
         TypedDict as TypedDict
     )
 
 
 _T = typing.TypeVar('_T')
-PY_37: Final = sys.version_info >= (3, 7)
+PY_37: typing_extensions.Final = sys.version_info >= (3, 7)
 
 
 if sys.platform == 'win32':

asyncpg/connect_utils.py

@@ -20,6 +20,7 @@
 import sys
 import time
 import typing
+import typing_extensions
 import urllib.parse
 import warnings
 import inspect
@@ -85,8 +86,10 @@ class _ClientConfiguration(typing.NamedTuple):
     max_cacheable_statement_size: int
 
 
-_system: compat.Final = platform.uname().system
-PGPASSFILE: compat.Final = 'pgpass.conf' if _system == 'Windows' else '.pgpass'
+_system: typing_extensions.Final = platform.uname().system
+PGPASSFILE: typing_extensions.Final = (
+    'pgpass.conf' if _system == 'Windows' else '.pgpass'
+)
 
 
 def _read_password_file(

asyncpg/connection.py

@@ -164,7 +164,7 @@ def __init__(self, protocol: '_cprotocol.BaseProtocol[_Record]',
                  addr: typing.Union[typing.Tuple[str, int], str],
                  config: connect_utils._ClientConfiguration,
                  params: connect_utils._ConnectionParameters) -> None:
-        self._protocol = protocol
+        self._protocol: '_cprotocol.BaseProtocol[_Record]' = protocol
         self._transport = transport
         self._loop = loop
         self._top_xact: typing.Optional[transaction.Transaction] = None

asyncpg/introspection.py

@@ -6,14 +6,13 @@
 
 
 import typing
-
-from . import compat
+import typing_extensions
 
 if typing.TYPE_CHECKING:
     from . import protocol
 
 
-_TYPEINFO_13: compat.Final = '''\
+_TYPEINFO_13: typing_extensions.Final = '''\
     (
         SELECT
             t.oid                           AS oid,
@@ -90,7 +89,7 @@
 '''
 
 
-INTRO_LOOKUP_TYPES_13: compat.Final = '''\
+INTRO_LOOKUP_TYPES_13: typing_extensions.Final = '''\
 WITH RECURSIVE typeinfo_tree(
     oid, ns, name, kind, basetype, elemtype, elemdelim,
     range_subtype, attrtypoids, attrnames, depth)
@@ -132,7 +131,7 @@
 '''.format(typeinfo=_TYPEINFO_13)
 
 
-_TYPEINFO: compat.Final = '''\
+_TYPEINFO: typing_extensions.Final = '''\
     (
         SELECT
             t.oid                           AS oid,
@@ -214,7 +213,7 @@
 '''
 
 
-INTRO_LOOKUP_TYPES: compat.Final = '''\
+INTRO_LOOKUP_TYPES: typing_extensions.Final = '''\
 WITH RECURSIVE typeinfo_tree(
     oid, ns, name, kind, basetype, elemtype, elemdelim,
     range_subtype, attrtypoids, attrnames, depth)
@@ -256,7 +255,7 @@
 '''.format(typeinfo=_TYPEINFO)
 
 
-TYPE_BY_NAME: compat.Final = '''\
+TYPE_BY_NAME: typing_extensions.Final = '''\
 SELECT
     t.oid,
     t.typelem     AS elemtype,
@@ -269,7 +268,7 @@
 '''
 
 
-TYPE_BY_OID: compat.Final = '''\
+TYPE_BY_OID: typing_extensions.Final = '''\
 SELECT
     t.oid,
     t.typelem     AS elemtype,
@@ -282,7 +281,7 @@
 
 
 # 'b' for a base type, 'd' for a domain, 'e' for enum.
-SCALAR_TYPE_KINDS: compat.Final = (b'b', b'd', b'e')
+SCALAR_TYPE_KINDS: typing_extensions.Final = (b'b', b'd', b'e')
 
 
 def is_scalar_type(typeinfo: 'protocol.Record') -> bool:

asyncpg/mypy/common.py

@@ -2,10 +2,11 @@
 import mypy.plugin
 import mypy.types
 import typing
+import typing_extensions
 
 from .. import compat
 
-RECORD_NAME: compat.Final = 'asyncpg.protocol.protocol.Record'
+RECORD_NAME: typing_extensions.Final = 'asyncpg.protocol.protocol.Record'
 MethodPairType = typing.Tuple[typing.List[mypy.nodes.Argument],
                               mypy.types.Type]
 FieldPairType = typing.Tuple[str, mypy.types.Type]

asyncpg/protocol/protocol.pyi

@@ -18,11 +18,11 @@ from typing import (
     final,
     overload,
 )
-from typing_extensions import TypeAlias
+from typing_extensions import Final, TypeAlias
 
 import asyncpg.pgproto.pgproto
 
-from ..compat import Final, Literal
+from ..compat import Literal
 from ..connect_utils import _ConnectionParameters
 from ..pgproto.pgproto import WriteBuffer
 from ..types import Type, Attribute

asyncpg/transaction.py

@@ -7,6 +7,7 @@
 
 import enum
 import typing
+import typing_extensions
 
 from . import compat
 from . import connresource
@@ -28,14 +29,14 @@ class TransactionState(enum.Enum):
 IsolationLevels = compat.Literal['read_committed',
                                  'serializable',
                                  'repeatable_read']
-ISOLATION_LEVELS: compat.Final[
+ISOLATION_LEVELS: typing_extensions.Final[
     typing.Set[IsolationLevels]
 ] = {
     'read_committed',
     'serializable',
     'repeatable_read'
 }
-ISOLATION_LEVELS_BY_VALUE: compat.Final[
+ISOLATION_LEVELS_BY_VALUE: typing_extensions.Final[
     typing.Dict[str, IsolationLevels]
 ] = {
     'read committed': 'read_committed',