summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Issue #29009: Merge 3.6.Xiang Zhang2016-12-192-8/+0
|\
| * Issue #29009: Merge 3.5.Xiang Zhang2016-12-192-8/+0
| |\
| | * Issue #29009: Remove outdated doc of PyUnicode_RichCompare.Xiang Zhang2016-12-192-8/+0
| | |
* | | Issue #19542: Fix bugs in WeakValueDictionary.setdefault() and ↵Antoine Pitrou2016-12-193-5/+53
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | WeakValueDictionary.pop() when a GC collection happens in another thread. Original patch and report by Armin Rigo.
| * | Issue #19542: Fix bugs in WeakValueDictionary.setdefault() and ↵Antoine Pitrou2016-12-193-5/+53
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | WeakValueDictionary.pop() when a GC collection happens in another thread. Original patch and report by Armin Rigo.
| | * Issue #19542: Fix bugs in WeakValueDictionary.setdefault() and ↵Antoine Pitrou2016-12-193-5/+53
| | | | | | | | | | | | | | | | | | | | | | | | WeakValueDictionary.pop() when a GC collection happens in another thread. Original patch and report by Armin Rigo.
* | | Issue #28996: Merge 3.6.Xavier de Gaye2016-12-191-2/+2
|\ \ \ | |/ /
| * | Issue #28996: Skip two tests that fail on Android with the locale strcoll() andXavier de Gaye2016-12-191-2/+2
| | | | | | | | | | | | strxfrm() functions.
* | | Issue #25677: Merge SyntaxError caret positioning from 3.6Martin Panter2016-12-195-5/+39
|\ \ \ | |/ /
| * | Issue #25677: Merge SyntaxError caret positioning from 3.5Martin Panter2016-12-195-5/+39
| |\ \ | | |/
| | * Issue #25677: Correct syntax error caret for indented blocks.Martin Panter2016-12-115-5/+39
| | | | | | | | | | | | Based on patch by Michael Layzell.
* | | Issue #20191: Fixed a crash in resource.prlimit() when pass a sequence thatSerhiy Storchaka2016-12-193-33/+48
|\ \ \ | |/ / | | | | | | doesn't own its elements as limits.
| * | Issue #20191: Fixed a crash in resource.prlimit() when pass a sequence thatSerhiy Storchaka2016-12-193-33/+48
| |\ \ | | |/ | | | | | | doesn't own its elements as limits.
| | * Issue #20191: Fixed a crash in resource.prlimit() when pass a sequence thatSerhiy Storchaka2016-12-193-33/+48
| | | | | | | | | | | | doesn't own its elements as limits.
* | | Merge: #29005: clarify terminology in tutorial 'method' discussion.R David Murray2016-12-181-3/+2
|\ \ \ | |/ /
| * | Merge: #29005: clarify terminology in tutorial 'method' discussion.R David Murray2016-12-181-3/+2
| |\ \ | | |/
| | * #29005: clarify terminology in tutorial 'method' discussion.R David Murray2016-12-181-3/+2
| | | | | | | | | | | | Patch by Jim Fasarakis-Hilliard.
* | | One more typo fix for 3.7Martin Panter2016-12-181-1/+1
| | |
* | | Issue #28987: Merge doc and comment fixes from 3.6Martin Panter2016-12-186-8/+8
|\ \ \ | |/ /
| * | Issue #28987: Typos, grammar, spelling in documentationMartin Panter2016-12-182-5/+5
| | |
| * | Merge spelling and grammar from 3.5Martin Panter2016-12-184-4/+4
| |\ \ | | |/
| | * Fix spelling and grammar in code comments and documentationMartin Panter2016-12-184-4/+4
| | |
* | | Merge #28407 Improve test coverage of make_msgid.R David Murray2016-12-182-0/+13
|\ \ \ | |/ /
| * | Merge #28407 Improve test coverage of make_msgid.R David Murray2016-12-182-0/+13
| |\ \ | | |/
| | * #28407 Improve test coverage of make_msgid.R David Murray2016-12-182-0/+13
| | | | | | | | | | | | Patch by Dillon Brock.
* | | Issue #25778: winreg does not truncase string correctly (Patch by Eryk Sun)Steve Dower2016-12-173-8/+21
|\ \ \ | |/ /
| * | Issue #25778: winreg does not truncase string correctly (Patch by Eryk Sun)Steve Dower2016-12-173-8/+21
| | |
* | | Merge for the porting HOWTO updateBrett Cannon2016-12-171-49/+61
|\ \ \ | |/ /
| * | Merge for porting HOWTO updateBrett Cannon2016-12-171-49/+61
| |\ \ | | |/
| | * Update porting HOWTO to drop unicode_literals and mention static type checkingBrett Cannon2016-12-171-49/+61
| | |
* | | Issue #29000: Fixed bytes formatting of octals with zero padding in alternateSerhiy Storchaka2016-12-173-11/+31
|\ \ \ | |/ / | | | | | | form.
| * | Issue #29000: Fixed bytes formatting of octals with zero padding in alternateSerhiy Storchaka2016-12-173-11/+31
| |\ \ | | |/ | | | | | | form.
| | * Issue #29000: Fixed bytes formatting of octals with zero padding in alternateSerhiy Storchaka2016-12-173-11/+31
| | | | | | | | | | | | form.
* | | Issue #28596: The preferred encoding is UTF-8 on Android.Xavier de Gaye2016-12-173-14/+29
| | |
* | | Null merge from 3.6Ned Deily2016-12-170-0/+0
|\ \ \ | |/ /
| * | Merge 3.6.0rc2 Misc/NEWS entries into 3.6.1Ned Deily2016-12-171-8/+31
| | |
* | | Null merge from 3.6Ned Deily2016-12-171-0/+1
|\ \ \ | |/ /
| * | Null merge v3.6.0rc2 release into mainline 3.6Ned Deily2016-12-171-0/+1
| |\ \
| | * \ Null merge v3.6.0rc2 tag into mainline 3.6Ned Deily2016-12-161-0/+1
| | |\ \
| | | * | Added tag v3.6.0rc2 for changeset 800a67f7806dNed Deily2016-12-161-0/+1
| | | | |
| | | * | Version bump for 3.6.0rc2v3.6.0rc2Ned Deily2016-12-163-4/+4
| | | | |
| | | * | Update pydoc topics for 3.6.0rc2Ned Deily2016-12-161-3/+32
| | | | |
| | * | | null merge additional 3.6.0rc1+ cherrypicksNed Deily2016-12-160-0/+0
| | |\ \ \ | | | |/ /
| | | * | Tidy Misc/NEWS for 3.6.0rc1+ cherrypicks.Ned Deily2016-12-161-4/+8
| | | | |
| | | * | Merge 3.5 (issue #28990)Yury Selivanov2016-12-163-0/+15
| | | | |
| | | * | Issue #28770: Update python-gdb.py for fastcallsVictor Stinner2016-11-222-26/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Frame.is_other_python_frame() now also handles _PyCFunction_FastCallDict() frames. Thanks to the new code to handle fast calls, python-gdb.py is now also able to detect the <built-in id method of module ...> frame. (grafted from f41d02d7da373ccaff97a42b66b051260bd55996)
* | | | | Issue #28991: Address comment that the __len__ call looked unattractiveRaymond Hettinger2016-12-161-3/+4
| | | | |
* | | | | mergeRaymond Hettinger2016-12-163-2/+20
|\ \ \ \ \ | |/ / / /
| * | | | mergeRaymond Hettinger2016-12-163-2/+20
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Issue #28991: Fix obscure reentrancy bug in functools.lru_cache().Raymond Hettinger2016-12-163-2/+20
| | | |