8000 bpo-37058: PEP 544: Add Protocol to typing module by ilevkivskyi · Pull Request #13585 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-37058: PEP 544: Add Protocol to typing module #13585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
May 28, 2019
Merged

bpo-37058: PEP 544: Add Protocol to typing module #13585

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
442da2c
Copy stuff from typing_extensions
ilevkivskyi May 26, 2019
0764a0e
Move code around + cleanup
ilevkivskyi May 26, 2019
727314d
Fix typo
ilevkivskyi May 26, 2019
78d2ddd
Add few comments and minor clean-ups
ilevkivskyi May 26, 2019
a540902
Allow sub-protocols of protocols in collections.abc
ilevkivskyi May 26, 2019
0a9d22f
Better docstrings
ilevkivskyi May 26, 2019
5fac4c3
Update __all__
ilevkivskyi May 26, 2019
815c9b2
Add docs
ilevkivskyi May 26, 2019
d521860
Some docs fixes
ilevkivskyi May 26, 2019
5e77669
Remove redundant annotation
ilevkivskyi May 26, 2019
2de4ce7
📜🤖 Added by blurb_it.
blurb-it[bot] May 26, 2019
c90f6f2
Address CR
ilevkivskyi May 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Allow sub-protocols of protocols in collections.abc
  • Loading branch information
@ilevkivskyi
ilevkivskyi committed May 26, 2019
commit a5409029dafaaa9d052c2a2bb8f60b3fa59ea6a3
14 changes: 14 additions & 0 deletions Lib/test/test_typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1348,6 +1348,20 @@ class C2(C1):
c = C2()
self.assertIsInstance(c, C1)

def test_collections_protocols_allowed(self):
@runtime_checkable
class Custom(collections.abc.Iterable, Protocol):
def close(self): ...

class A: pass
class B:
def __iter__(self):
return []
def close(self):
return 0

self.assertIsSubclass(B, Custom)
self.assertNotIsSubclass(A, Custom)

class GenericTests(BaseTestCase):

Expand Down
9 changes: 5 additions & 4 deletions Lib/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,10 +983,10 @@ def _allow_reckless_class_cheks():
return True


_PROTOCOL_WHITELIST = ['Callable', 'Awaitable',
'Iterable', 'Iterator', 'AsyncIterable', 'AsyncIterator',
'Hashable', 'Sized', 'Container', 'Collection', 'Reversible',
'ContextManager', 'AsyncContextManager']
_PROTO_WHITELIST = ['Callable', 'Awaitable',
'Iterable', 'Iterator', 'AsyncIterable', 'AsyncIterator',
'Hashable', 'Sized', 'Container', 'Collection', 'Reversible',
'ContextManager', 'AsyncContextManager']


class _ProtocolMeta(ABCMeta):
Expand Down Expand Up @@ -1097,6 +1097,7 @@ def _proto_hook(other):
# ... otherwise check consistency of bases, and prohibit instantiation.
for base in cls.__bases__:
if not (base in (object, Generic) or
base.__module__ == 'collections.abc' and base.__name__ in _PROTO_WHITELIST or
issubclass(base, Generic) and base._is_protocol):
raise TypeError('Protocols can only inherit from other'
' protocols, got %r' % base)
Expand Down
0