GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — bpo-38908: Fix issue when non runtime_protocol does not raise TypeError by uriyyo · Pull Request #26067 · python/cpython

bpo-38908: Fix issue when non runtime_protocol does not raise TypeError #26067

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.

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

gvanrossum merged 4 commits into python:main from uriyyo:fix-issue-38908

May 12, 2021

Uh oh!

There was an error while loading. Please reload this page.

Merged

bpo-38908: Fix issue when non runtime_protocol does not raise TypeError #26067

Show file tree

Hide file tree

Changes from all commits

Commits

Show all changes

4 commits

Select commit Hold shift + click to select a range

53d5008

Fix issue when non runtime_protocol does not raise TypeError

Update Lib/test/test_typing.py

uriyyo May 12, 2021

d2baaba

Update Misc/NEWS.d/next/Library/2021-05-12-16-43-21.bpo-38908.nM2_rO.rst

uriyyo May 12, 2021

File filter

Filter by extension .py (2) .rst (1) All 2 file types selected

Viewed files

Clear filters

Conversations

Failed to load comments.

Uh oh!

There was an error while loading. Please reload this page.

Jump to

Jump to file

Failed to load files.

Uh oh!

There was an error while loading. Please reload this page.

Diff view

Unified

Split

Hide whitespace

Diff view

Unified

Split

Hide whitespace

There are no files selected for viewing

8 changes: 8 additions & 0 deletions 8 Lib/test/test_typing.py

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -1422,6 +1422,14 @@ class CustomProtocol(TestCase, Protocol):
		class CustomContextManager(typing.ContextManager, Protocol):
		pass

		def test_non_runtime_protocol_isinstance_check(self):
		class P(Protocol):
		x: int

		with self.assertRaisesRegex(TypeError, "@runtime_checkable"):
		isinstance(1, P)


		class GenericTests(BaseTestCase):

		def test_basics(self):
Expand Down

12 changes: 10 additions & 2 deletions 12 Lib/typing.py

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -1343,14 +1343,14 @@ def _no_init(self, args, *kwargs):
		raise TypeError('Protocols cannot be instantiated')


		def _allow_reckless_class_checks():
		def _allow_reckless_class_checks(depth=3):
		"""Allow instance and class checks for special stdlib modules.

		The abc and functools modules indiscriminately call isinstance() and
		issubclass() on the whole MRO of a user class, which may contain protocols.
		"""
		try:
		return sys._getframe(3).f_globals['__name__'] in ['abc', 'functools']
		return sys._getframe(depth).f_globals['__name__'] in ['abc', 'functools']
		except (AttributeError, ValueError): # For platforms without _getframe().
		return True

Expand All		@@ -1370,6 +1370,14 @@ class _ProtocolMeta(ABCMeta):
		def __instancecheck__(cls, instance):
Comment thread uriyyo marked this conversation as resolved. Resolved Uh oh! There was an error while loading. Please reload this page.
		# We need this method for situations where attributes are
		# assigned in __init__.
		if (
		getattr(cls, '_is_protocol', False) and
		not getattr(cls, '_is_runtime_protocol', False) and
		not _allow_reckless_class_checks(depth=2)
		):
		raise TypeError("Instance and class checks can only be used with"
		" @runtime_checkable protocols")

		if ((not getattr(cls, '_is_protocol', False) or
		_is_callable_members_only(cls)) and
		issubclass(instance.__class__, cls)):
Expand Down

5 changes: 5 additions & 0 deletions 5 Misc/NEWS.d/next/Library/2021-05-12-16-43-21.bpo-38908.nM2_rO.rst

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,5 @@
		Fix issue where :mod:`typing` protocols without the ``@runtime_checkable``
		decorator did not raise a ``TypeError`` when used with ``issubclass`` and
		``isinstance``. Now, subclassses of ``typing.Protocol`` will raise a
		``TypeError`` when used with with those checks.
		Patch provided by Yurii Karabas.

Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.