Skip to content
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

typing: Use PEP 695 syntax in typing.py #104553

Merged
merged 5 commits into from
May 17, 2023
Merged

Conversation

JelleZijlstra
Copy link
Member

No description provided.

@@ -2577,8 +2578,6 @@ def new_user(user_class: Type[U]) -> U:
At this point the type checker knows that joe has type BasicUser.
"""

# Internal type variable for callables. Not for export.
F = TypeVar("F", bound=Callable[..., Any])
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one was added as part of implementing override earlier in 3.12, so there's no need to keep it around for compatibility.

Lib/typing.py Outdated
@@ -3203,7 +3202,7 @@ def reveal_type(obj: T, /) -> T:
return obj


def dataclass_transform(
def dataclass_transform[T](
Copy link
Member

@AlexWaygood AlexWaygood May 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This feels slightly strange to me, as (to me) it implies that dataclass_transform is a function generic around the type variable T. But that's not really true; it's a non-generic function that returns an identity function. I skimmed PEP 695, and it doesn't seem to mention how such cases should be handled.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC we did think about this and decided that this is indeed how such cases should be spelled (since Callable doesn't have a way yet to spell "generic").

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we shouldn't do this since it confuses scoping and much of the point of PEP 695 is to clarify scoping. We can use a callback protocol to spell this.

I'd brought this up somewhere before PEP 695 was accepted, but didn't get much of a response. Presumably since it's not the most common thing and I think e.g. pyre might not even support -> Callable[[T], T]

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed to a callback protocol

Lib/typing.py Outdated Show resolved Hide resolved
Copy link
Member

@AlexWaygood AlexWaygood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test_typing failures look concerning!

@AlexWaygood
Copy link
Member

The test_typing failures look concerning!

I filed:

Lib/typing.py Outdated
@@ -3203,7 +3202,7 @@ def reveal_type(obj: T, /) -> T:
return obj


def dataclass_transform(
def dataclass_transform[T](
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC we did think about this and decided that this is indeed how such cases should be spelled (since Callable doesn't have a way yet to spell "generic").

Lib/typing.py Outdated Show resolved Hide resolved
Lib/typing.py Outdated Show resolved Hide resolved
Lib/typing.py Outdated
Comment on lines 3290 to 3293
type _Func = Callable[..., Any]

def override(method: F, /) -> F:

def override[F: _Func](method: F, /) -> F:
Copy link
Member

@AlexWaygood AlexWaygood May 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, the alias makes that so much more readable, in my opinion. Thanks! Good call @gvanrossum.

Copy link
Member

@gvanrossum gvanrossum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't care what you do with dataclass_transform -- either approach is fine with me. So, LGTM and don't wait for me.

@JelleZijlstra JelleZijlstra merged commit 0cb2fdc into python:main May 17, 2023
@JelleZijlstra JelleZijlstra deleted the use695 branch May 17, 2023 13:04
carljm added a commit to carljm/cpython that referenced this pull request May 17, 2023
* main: (26 commits)
  pythonGH-101520: Move tracemalloc functionality into core, leaving interface in Modules. (python#104508)
  typing: Add more tests for TypeVar (python#104571)
  pythongh-104572: Improve error messages for invalid constructs in PEP 695 contexts (python#104573)
  typing: Use PEP 695 syntax in typing.py (python#104553)
  pythongh-102153: Start stripping C0 control and space chars in `urlsplit` (python#102508)
  pythongh-104469: Update README.txt for _testcapi (pythongh-104529)
  pythonGH-103092: isolate `_elementtree` (python#104561)
  pythongh-104050: Add typing to Argument Clinic converters (python#104547)
  pythonGH-103906: Remove immortal refcounting in the interpreter (pythonGH-103909)
  pythongh-87474: Fix file descriptor leaks in subprocess.Popen (python#96351)
  pythonGH-103092: isolate `pyexpat`  (python#104506)
  pythongh-75367: Fix data descriptor detection in inspect.getattr_static (python#104517)
  pythongh-104050: Add more annotations to `Tools/clinic.py` (python#104544)
  pythongh-104555: Fix isinstance() and issubclass() for runtime-checkable protocols that use PEP 695 (python#104556)
  pythongh-103865: add monitoring support to LOAD_SUPER_ATTR (python#103866)
  CODEOWNERS: Assign new PEP 695 files to myself (python#104551)
  pythonGH-104510: Fix refleaks in `_io` base types (python#104516)
  pythongh-104539: Fix indentation error in logging.config.rst (python#104545)
  pythongh-104050: Don't star-import 'types' in Argument Clinic (python#104543)
  pythongh-104050: Add basic typing to CConverter in clinic.py (python#104538)
  ...
JelleZijlstra added a commit to JelleZijlstra/cpython that referenced this pull request May 18, 2023
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
@JelleZijlstra JelleZijlstra restored the use695 branch September 10, 2024 23:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants