Commit f091228

committed

Fix for metaclass errors in Python 3.6

1 parent 75466f4 commit f091228Copy full SHA for f091228

File tree

+27

-4

lines changed

+27

-4

lines changed

Lines changed: 15 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -103,14 +103,22 @@ def __call__(`
`103`	`103`	`...`
`104`	`104`
`105`	`105`
`106`		`-class ConnectionMeta(type):`
	`106`	`+class _ConnectionMeta(type):`
`107`	`107`
`108`	`108`	`def __instancecheck__(cls, instance: typing.Any) -> bool:`
`109`	`109`	`mro = type(instance).__mro__`
`110`	`110`	`return Connection in mro or _ConnectionProxy in mro`
`111`	`111`
`112`	`112`
`113`		`-class Connection(typing.Generic[_Record], metaclass=ConnectionMeta):`
	`113`	`+if sys.version_info >= (3, 7):`
	`114`	`+ ConnectionMeta = _ConnectionMeta`
	`115`	`+else:`
	`116`	`+ # see: https://github.com/python/typing/issues/449`
	`117`	`+ class ConnectionMeta(_ConnectionMeta, typing.GenericMeta):`
	`118`	`+ ...`
	`119`	`+`
	`120`	`+`
	`121`	`+class Connection(typing.Generic[_Record], metaclass=ConnectionMeta): # type: ignore[misc] # noqa: E501`
`114`	`122`	`"""A representation of a database session.`
`115`	`123`
`116`	`124`	Connections are created by calling :func:`~asyncpg.connection.connect`.
`@@ -2424,6 +2432,11 @@ async def _do_execute(`
`2424`	`2432`	`return result, stmt`
`2425`	`2433`
`2426`	`2434`
	`2435`	`+if sys.version_info < (3, 7):`
	`2436`	`+ # see: https://bugs.python.org/issue41451`
	`2437`	`+ del Connection.__slots__`
	`2438`	`+`
	`2439`	`+`
`2427`	`2440`	`@typing.overload`
`2428`	`2441`	`async def connect(dsn: typing.Optional[str] = ..., *,`
`2429`	`2442`	`host: typing.Optional[connect_utils.HostType] = ...,`

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`import functools`
`10`	`10`	`import inspect`
`11`	`11`	`import logging`
	`12`	`+import sys`
`12`	`13`	`import time`
`13`	`14`	`import typing`
`14`	`15`	`import warnings`
`@@ -25,7 +26,7 @@`
`25`	`26`	`_Record = typing.TypeVar('_Record', bound=protocol.Record)`
`26`	`27`
`27`	`28`
`28`		`-class PoolConnectionProxyMeta(type):`
	`29`	`+class _PoolConnectionProxyMeta(type):`
`29`	`30`
`30`	`31`	`def __new__(mcls, name, bases, dct, *, wrap=False):`
`31`	`32`	`if wrap:`
`@@ -66,7 +67,16 @@ def call_con_method(self, args, *kwargs):`
`66`	`67`	`return call_con_method`
`67`	`68`
`68`	`69`
`69`		`-class PoolConnectionProxy(connection._ConnectionProxy,`
	`70`	`+if sys.version_info >= (3, 7):`
	`71`	`+ PoolConnectionProxyMeta = _PoolConnectionProxyMeta`
	`72`	`+else:`
	`73`	`+ # see: https://github.com/python/typing/issues/449`
	`74`	`+ class PoolConnectionProxyMeta(_PoolConnectionProxyMeta,`
	`75`	`+ typing.GenericMeta):`
	`76`	`+ ...`
	`77`	`+`
	`78`	`+`
	`79`	`+class PoolConnectionProxy(connection._ConnectionProxy[_Record],`
`70`	`80`	`metaclass=PoolConnectionProxyMeta,`
`71`	`81`	`wrap=True):`
`72`	`82`

Comments

(0)