From: Martin Panter <vadmium>
Date: Tue, 25 Aug 2015 05:41:51 +0000 (+0000)
Subject: Issue #24808: Merge 3.5 into 3.6
X-Git-Tag: v3.6.0a1~1739
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ccf426e7e77472b1ff1a919791aa3dd402836b83;p=thirdparty%2FPython%2Fcpython.git

Issue #24808: Merge 3.5 into 3.6
---

ccf426e7e77472b1ff1a919791aa3dd402836b83
diff --cc Misc/NEWS
index 625e7e6e0e76,0d7ae1d44cab..e12494c03d74
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -129,12 -149,6 +129,15 @@@ IDL
  Documentation
  -------------
  
++- Issue #24808: Update the types of some PyTypeObject fields. Patch by
++  Joseph Weston.
++
 +- Issue #22812: Fix unittest discovery examples.
 +  Patch from Pam McA'Nulty.
 +
 +- Issue #23725: Overhaul tempfile docs. Note deprecated status of mktemp.
 +  Patch from Zbigniew Jędrzejewski-Szmek.
 +
  - Issue #24129: Clarify the reference documentation for name resolution.
    This includes removing the assumption that readers will be familiar with the
    name resolution scheme Python used prior to the introduction of lexical