merge 3.3 (closes #20108)

diff --cc Doc/library/inspect.rst
Simple merge

diff --cc Lib/inspect.py
Simple merge

diff --cc Misc/NEWS
index 69f43b01c370db16950a1e6ba9d64a3fa01ad3fc,7863b468da9849c8211dc8eb5b2e1361e57e7f1e..79509eb933c26f8cf7558bd6b66c7577b56ad623
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -44,9 -29,10 +44,11 @@@ Core and Builtin
  Library
  -------
  
 -- Issue #12692: Backport the fix for ResourceWarning in test_urllib2net. This
 -  also helps in closing the socket when Connection Close header is not sent.
 +- Fix breakage in TestSuite.countTestCases() introduced by issue #11798.
 +
+ - Issue #20108: Avoid parameter name clash in inspect.getcallargs().
+ 
 +- Issue #19918: Fix PurePath.relative_to() under Windows.
  
  - Issue #19422: Explicitly disallow non-SOCK_STREAM sockets in the ssl
    module, rather than silently let them emit clear text data.