From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 2 Jan 2014 18:26:50 +0000 (-0600)
Subject: merge 3.3 (closes #20108)
X-Git-Tag: v3.4.0b2~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c22eaecd53a3d9dc7ca441e6d6f1e0148469f1e9;p=python

merge 3.3 (closes #20108)
---

c22eaecd53a3d9dc7ca441e6d6f1e0148469f1e9
diff --cc Misc/NEWS
index 69f43b01c3,7863b468da..79509eb933
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -44,9 -29,10 +44,11 @@@ Core and Builtin
  Library
  -------
  
 +- Fix breakage in TestSuite.countTestCases() introduced by issue #11798.
 +
+ - Issue #20108: Avoid parameter name clash in inspect.getcallargs().
+ 
 -- Issue #12692: Backport the fix for ResourceWarning in test_urllib2net. This
 -  also helps in closing the socket when Connection Close header is not sent.
 +- 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.