[Python-checkins] Fix various ParamSpec errors in typing (GH-24176)

[miss-islington]

https://github.com/python/cpython/commit/ace008c531dd685a30c1dd68f9b5ba35f20171cf
commit: ace008c531dd685a30c1dd68f9b5ba35f20171cf
branch: master
author: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-01-10T16:11:41-08:00
summary:

Fix various ParamSpec errors in typing (GH-24176)



1. ParamSpec -> TypeVar for ``typing.Concatenate``
2. ParamSpec's call signature should align with its documentation.
Noticed in GH-24169

files:
M Doc/library/typing.rst
M Lib/typing.py

diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
index c14c710813381..3b4dba3e0e0a9 100644
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -695,10 +695,10 @@ These can be used as types in annotations using ``[]``, each having a unique syn
 
       from collections.abc import Callable
       from threading import Lock
-      from typing import Any, Concatenate, ParamSpec
+      from typing import Any, Concatenate, ParamSpec, TypeVar
 
       P = ParamSpec('P')
-      R = ParamSpec('R')
+      R = TypeVar('R')
 
       # Use this lock to ensure that only one thread is executing a function
       # at any time.
diff --git a/Lib/typing.py b/Lib/typing.py
index 88d0d623a421f..6224930c3b027 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -779,7 +779,7 @@ def add_two(x: float, y: float) -> float:
     args = object()
     kwargs = object()
 
-    def __init__(self, name, bound=None, covariant=False, contravariant=False):
+    def __init__(self, name, *, bound=None, covariant=False, contravariant=False):
         self.__name__ = name
         super().__init__(bound, covariant, contravariant)
         try: