Commit Graph

97959 Commits

Author SHA1 Message Date
Xiang Zhang bd0ff946bc Issue #29009: Merge 3.6. 2016-12-19 18:39:28 +08:00
Xiang Zhang 47888da90b Issue #29009: Merge 3.5. 2016-12-19 18:39:02 +08:00
Xiang Zhang bfbc29cb8f Issue #29009: Remove outdated doc of PyUnicode_RichCompare. 2016-12-19 18:35:14 +08:00
Antoine Pitrou ec60edb977 Issue #19542: Fix bugs in WeakValueDictionary.setdefault() and WeakValueDictionary.pop()
when a GC collection happens in another thread.

Original patch and report by Armin Rigo.
2016-12-19 10:59:15 +01:00
Antoine Pitrou d4580ecb8d Issue #19542: Fix bugs in WeakValueDictionary.setdefault() and WeakValueDictionary.pop()
when a GC collection happens in another thread.

Original patch and report by Armin Rigo.
2016-12-19 10:58:14 +01:00
Antoine Pitrou c1ee488962 Issue #19542: Fix bugs in WeakValueDictionary.setdefault() and WeakValueDictionary.pop()
when a GC collection happens in another thread.

Original patch and report by Armin Rigo.
2016-12-19 10:56:40 +01:00
Xavier de Gaye e0c4e96119 Issue #28996: Merge 3.6. 2016-12-19 10:46:59 +01:00
Xavier de Gaye 5bccb0e03d Issue #28996: Skip two tests that fail on Android with the locale strcoll() and
strxfrm() functions.
2016-12-19 10:46:14 +01:00
Martin Panter b46edf35f3 Issue #25677: Merge SyntaxError caret positioning from 3.6 2016-12-19 06:46:12 +00:00
Martin Panter 619555d77b Issue #25677: Merge SyntaxError caret positioning from 3.5 2016-12-19 06:46:01 +00:00
Serhiy Storchaka 932ee73188 Issue #20191: Fixed a crash in resource.prlimit() when pass a sequence that
doesn't own its elements as limits.
2016-12-19 08:07:29 +02:00
Serhiy Storchaka 879199ba11 Issue #20191: Fixed a crash in resource.prlimit() when pass a sequence that
doesn't own its elements as limits.
2016-12-19 08:05:39 +02:00
Serhiy Storchaka b94eef2ae3 Issue #20191: Fixed a crash in resource.prlimit() when pass a sequence that
doesn't own its elements as limits.
2016-12-19 08:04:15 +02:00
R David Murray 39d60fa926 Merge: #29005: clarify terminology in tutorial 'method' discussion. 2016-12-18 15:01:38 -05:00
R David Murray cd259bfd5a Merge: #29005: clarify terminology in tutorial 'method' discussion. 2016-12-18 15:00:23 -05:00
R David Murray 4ec1590fbf #29005: clarify terminology in tutorial 'method' discussion.
Patch by Jim Fasarakis-Hilliard.
2016-12-18 14:59:58 -05:00
Martin Panter a03d5ca41e One more typo fix for 3.7 2016-12-18 01:37:12 +00:00
Martin Panter fc29c88b5f Issue #28987: Merge doc and comment fixes from 3.6 2016-12-18 05:41:55 +00:00
R David Murray 3e8d9413eb Merge #28407 Improve test coverage of make_msgid. 2016-12-17 22:04:48 -05:00
R David Murray d4f8132278 Merge #28407 Improve test coverage of make_msgid. 2016-12-17 22:04:20 -05:00
R David Murray c69fd86f94 #28407 Improve test coverage of make_msgid.
Patch by Dillon Brock.
2016-12-17 22:03:44 -05:00
Martin Panter 59b0eb524f Issue #28987: Typos, grammar, spelling in documentation 2016-12-18 01:26:53 +00:00
Martin Panter fff07e34fa Merge spelling and grammar from 3.5 2016-12-18 05:37:21 +00:00
Martin Panter 2f9171d900 Fix spelling and grammar in code comments and documentation 2016-12-18 01:23:09 +00:00
Steve Dower bbc5877427 Issue #25778: winreg does not truncase string correctly (Patch by Eryk Sun) 2016-12-17 13:31:58 -08:00
Steve Dower 40fa26606d Issue #25778: winreg does not truncase string correctly (Patch by Eryk Sun) 2016-12-17 13:30:27 -08:00
Brett Cannon ec38bcb66e Merge for the porting HOWTO update 2016-12-17 12:38:00 -08:00
Brett Cannon ce042af3fe Merge for porting HOWTO update 2016-12-17 12:37:41 -08:00
Brett Cannon 5866719510 Update porting HOWTO to drop unicode_literals and mention static type checking 2016-12-17 12:37:20 -08:00
Serhiy Storchaka 9d16b616d5 Issue #29000: Fixed bytes formatting of octals with zero padding in alternate
form.
2016-12-17 22:15:10 +02:00
Serhiy Storchaka 025f8953f1 Issue #29000: Fixed bytes formatting of octals with zero padding in alternate
form.
2016-12-17 22:13:05 +02:00
Serhiy Storchaka b1a1619bf0 Issue #29000: Fixed bytes formatting of octals with zero padding in alternate
form.
2016-12-17 21:48:03 +02:00
Xavier de Gaye 6c9dcda6b4 Issue #28596: The preferred encoding is UTF-8 on Android. 2016-12-17 09:19:11 +01:00
Ned Deily b06cde61a2 Null merge from 3.6 2016-12-16 23:17:52 -05:00
Ned Deily 75862c4c66 Merge 3.6.0rc2 Misc/NEWS entries into 3.6.1 2016-12-16 23:16:36 -05:00
Ned Deily 06f9d48c99 Null merge from 3.6 2016-12-16 22:56:48 -05:00
Ned Deily 40ed602836 Null merge v3.6.0rc2 release into mainline 3.6 2016-12-16 22:54:22 -05:00
Raymond Hettinger b2d4b3d415 Issue #28991: Address comment that the __len__ call looked unattractive 2016-12-16 14:59:37 -08:00
Raymond Hettinger 92c481a161 merge 2016-12-16 13:59:57 -08:00
Raymond Hettinger c28dbd0452 merge 2016-12-16 13:59:32 -08:00
Raymond Hettinger af56e0e70f Issue #28991: Fix obscure reentrancy bug in functools.lru_cache(). 2016-12-16 13:57:40 -08:00
Ned Deily 9af1221a00 Null merge v3.6.0rc2 tag into mainline 3.6 2016-12-16 16:52:37 -05:00
Ned Deily add9d43e49 Added tag v3.6.0rc2 for changeset 800a67f7806d 2016-12-16 16:42:30 -05:00
Ned Deily f7b280956d Version bump for 3.6.0rc2 2016-12-16 16:40:10 -05:00
Ned Deily 1e9aba51e2 Update pydoc topics for 3.6.0rc2 2016-12-16 16:33:41 -05:00
Ned Deily 5fcd87b197 null merge additional 3.6.0rc1+ cherrypicks 2016-12-16 16:04:25 -05:00
Ned Deily f6105a55cf Tidy Misc/NEWS for 3.6.0rc1+ cherrypicks. 2016-12-16 15:29:12 -05:00
Xavier de Gaye 076300f63e Issue #28971: Merge 3.6 2016-12-16 20:51:09 +01:00
Xavier de Gaye 10a22dc65a Issue #28971: Merge 3.5 2016-12-16 20:50:10 +01:00
Xavier de Gaye ac13beeef5 Issue #28971: Temporarily skip test_over until a permanent solution is found
for issue #28971.
2016-12-16 20:49:10 +01:00