summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Issue #28950: Disallow -j0 combined with -T/-l in regrtest.Xiang Zhang2016-12-194-2/+7
|\
| * Issue #28950: Disallow -j0 combined with -T/-l/-M in regrtest.Xiang Zhang2016-12-193-3/+9
| |
* | Merge 3.5Victor Stinner2016-12-191-5/+8
|\ \ | |/
| * doc: Suggest to hash(tuple of attr) rather than XORVictor Stinner2016-12-191-5/+8
| | | | | | | | | | | | Issue #28383: __hash__ documentation recommends naive XOR to combine but this is suboptimal. Update the doc to suggest to reuse the hash() method using a tuple, with an example.
* | 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 #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.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.
* | 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.
* | 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
|\ \ | |/
| * #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
| |
* | 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.
* | Merge 3.6.0rc2 Misc/NEWS entries into 3.6.1Ned Deily2016-12-171-8/+31
| |
* | 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)
* | | | mergeRaymond Hettinger2016-12-163-2/+20
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Issue #28991: Fix obscure reentrancy bug in functools.lru_cache().Raymond Hettinger2016-12-163-2/+20
| | |
* | | Issue #28971: Merge 3.5Xavier de Gaye2016-12-161-0/+2
|\ \ \ | |/ /
| * | Issue #28971: Temporarily skip test_over until a permanent solution is foundXavier de Gaye2016-12-161-0/+2
| | | | | | | | | | | | for issue #28971.
* | | Null mergeSerhiy Storchaka2016-12-160-0/+0
|\ \ \ | |/ /
| * | Merge headsSerhiy Storchaka2016-12-163-0/+15
| |\ \
* | \ \ Merge headsSerhiy Storchaka2016-12-163-0/+15
|\ \ \ \
| * \ \ \ Merge 3.5 (issue #28990)Yury Selivanov2016-12-163-0/+15
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Issue #28990: Fix SSL hanging if connection is closed before handshake ↵Yury Selivanov2016-12-163-0/+15
| | | | | | | | | | | | | | | | | | | | completed.
* | | | | Issue #14061: Misc fixes and cleanups in archiving code in shutil.Serhiy Storchaka2016-12-163-109/+112
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | Imporoved the documentation and tests for make_archive() and unpack_archive(). Improved error handling when corresponding compress module is not available. Brake circular dependency between shutil and tarfile modules.
| * | | Issue #14061: Misc fixes and cleanups in archiving code in shutil.Serhiy Storchaka2016-12-163-109/+112
| |/ / | | | | | | | | | | | | | | | Imporoved the documentation and tests for make_archive() and unpack_archive(). Improved error handling when corresponding compress module is not available. Brake circular dependency between shutil and tarfile modules.
* | | Merge 3.5Victor Stinner2016-12-161-2/+18
|\ \ \ | |/ /
| * | python-gdb.py: catch gdb.error on gdb.selected_frame()Victor Stinner2016-12-161-2/+18
| | |
* | | null merge 3.6.0rc1+ headNed Deily2016-12-160-0/+0
|\ \ \ | | |/ | |/|
| * | bump version to 3.6.0rc1+Ned Deily2016-12-161-1/+1
| | |