summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* MergeBrett Cannon2016-12-221-4/+4
|\
| * Grammatical fixes following #d95f19892fd0Brett Cannon2016-12-221-4/+4
| |
* | Issue #28762: lockf() is available on Android API level 24, but theXavier de Gaye2016-12-224-4/+45
| | | | | | | | F_LOCK macro is not defined in android-ndk-r13.
* | Issue #29044: Merge 3.5.Xiang Zhang2016-12-221-3/+4
|\ \ | |/
| * Issue #29044: Fix a use-after-free in string '%c' formatter.Xiang Zhang2016-12-221-3/+4
| |
* | Issue 28923: Remove editor artifacts from Tix.py,Terry Jan Reedy2016-12-222-4/+2
|\ \ | |/
| * Issue 28923: Remove editor artifacts from Tix.py.Terry Jan Reedy2016-12-222-4/+2
| |
* | Issue #28538: On Darwin net/if.h requires that sys/socket.h be included ↵Xavier de Gaye2016-12-212-4/+28
| | | | | | | | beforehand.
* | Issue #28538: Fix the compilation error that occurs because if_nameindex() isXavier de Gaye2016-12-213-2/+50
| | | | | | | | available on Android API level 24, but the if_nameindex structure is not defined.
* | Merge from 3.5.Serhiy Storchaka2016-12-213-0/+14
|\ \ | |/
| * Issue #28871: Fixed a crash when deallocate deep ElementTree.Serhiy Storchaka2016-12-213-0/+14
| |
* | merge 3.5 (#28932)Benjamin Peterson2016-12-205-3/+8
|\ \ | |/
| * add a specific configure check for sys/random.h (closes #28932)Benjamin Peterson2016-12-205-3/+8
| |
* | null mergeINADA Naoki2016-12-200-0/+0
|\ \ | |/
| * Issue #28147: Fix a memory leak in split-table dictionariesINADA Naoki2016-12-204-6/+46
| | | | | | | | setattr() must not convert combined table into split table.
* | 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)