summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* MergeBrett Cannon2016-12-221-4/+4
|\
| * MergeBrett Cannon2016-12-221-4/+4
| |\
| | * Grammatical fixes following #d95f19892fd0Brett Cannon2016-12-221-4/+4
| | |
* | | Issue #28762: Merge 3.6.Xavier de Gaye2016-12-224-4/+45
|\ \ \ | |/ /
| * | 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.6.Xiang Zhang2016-12-221-3/+4
|\ \ \ | |/ /
| * | 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 28923: Remove editor artifacts from Tix.py.Terry Jan Reedy2016-12-222-4/+2
| | |
* | | Issue #28538: Merge 3.6.Xavier de Gaye2016-12-212-4/+28
|\ \ \ | |/ /
| * | Issue #28538: On Darwin net/if.h requires that sys/socket.h be included ↵Xavier de Gaye2016-12-212-4/+28
| | | | | | | | | | | | beforehand.
* | | Fixed a type error introduced in issue #28992.Serhiy Storchaka2016-12-211-1/+1
| | |
* | | Issue #28538: Merge 3.6.Xavier de Gaye2016-12-213-2/+50
|\ \ \ | |/ /
| * | 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.
* | | Issue #28992: Use bytes.fromhex().Serhiy Storchaka2016-12-214-10/+7
| | |
* | | Merge from 3.6.Serhiy Storchaka2016-12-213-0/+14
|\ \ \ | |/ /
| * | 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
| | |
* | | Issue #28822: Adjust indices handling of PyUnicode_FindChar().Xiang Zhang2016-12-205-8/+55
| | |
* | | merge 3.6 (#28932)Benjamin Peterson2016-12-205-3/+8
|\ \ \ | |/ /
| * | 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
|\ \ \ | |/ /
| * | 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 #28927: bytes.fromhex() and bytearray.fromhex() now ignore all ASCIISerhiy Storchaka2016-12-195-4/+27
| | | | | | | | | | | | whitespace, not only spaces. Patch by Robert Xiao.
* | | Issue #28950: Merge 3.6.Xiang Zhang2016-12-194-2/+7
|\ \ \ | |/ /
| * | 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
| | |
* | | abstract.h: remove long outdated commentVictor Stinner2016-12-191-118/+2
| | | | | | | | | | | | | | | | | | | | | Issue #28838: The documentation is of the Python C API is more complete and more up to date than this old comment. Removal suggested by Antoine Pitrou.
* | | Merge 3.6Victor Stinner2016-12-191-5/+8
|\ \ \ | |/ /
| * | 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.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
|\ \ \ | |/ /