Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 3.2 fix updates and tests for issue #15906. | Barry Warsaw | 2012-09-12 | 2 | -5/+28 |
|\ | |||||
| * | Update merge from 2.7: s/basetring/str | Barry Warsaw | 2012-09-12 | 1 | -1/+1 |
| | | |||||
| * | A follow up for issue #15906: change the test for calling the type conversion | Barry Warsaw | 2012-09-12 | 2 | -5/+28 |
| | | | | | | | | | | | | | | | | on the action's default, reverting it back to previous behavior. Conversion is only done on string defaults. Add a test for this and another test that ensures such type conversions are only called once. | ||||
* | | Merge | Antoine Pitrou | 2012-09-12 | 1 | -3/+4 |
|\ \ | |||||
| * \ | Cleanup 'k' when the creation of PySTEntryObject fails. ad3824a90261 used to ↵ | Christian Heimes | 2012-09-12 | 1 | -1/+3 |
| |\ \ | | |/ | | | | | | | decref 'k' in too many error cases. | ||||
| | * | Cleanup 'k' when the creation of PySTEntryObject fails. ad3824a90261 used to ↵ | Christian Heimes | 2012-09-12 | 1 | -1/+3 |
| | | | | | | | | | | | | decref 'k' in too many error cases. | ||||
| * | | Partly revert ad3824a90261 and add comment about reference ownership | Christian Heimes | 2012-09-12 | 1 | -2/+1 |
| |\ \ | | |/ | |||||
| | * | Partly revert ad3824a90261 and add comment about reference ownership | Christian Heimes | 2012-09-12 | 1 | -2/+1 |
| | | | |||||
* | | | Issue #15926: Fix crash after multiple reinitializations of the interpreter. | Antoine Pitrou | 2012-09-12 | 2 | -1/+3 |
|/ / | |||||
* | | Fix out of bounds read in long_new() for empty bytes with an explicit base. ↵ | Christian Heimes | 2012-09-12 | 1 | -2/+2 |
|\ \ | |/ | | | | | int(b'', somebase) calls PyLong_FromString() with char* of length 1 but the function accesses the first argument at offset 1. CID 715359 | ||||
| * | Fix out of bounds read in long_new() for empty bytes with an explicit base. ↵ | Christian Heimes | 2012-09-12 | 1 | -2/+2 |
| | | | | | | | | int(b'', somebase) calls PyLong_FromString() with char* of length 1 but the function accesses the first argument at offset 1. CID 715359 | ||||
* | | - Issue #15906: Fix a regression in argparse caused by the preceding change, | Barry Warsaw | 2012-09-12 | 3 | -0/+14 |
|\ \ | |/ | | | | | when action='append', type='str' and default=[]. | ||||
| * | - Issue #15906: Fix a regression in argparse caused by the preceding change, | Barry Warsaw | 2012-09-12 | 3 | -0/+14 |
| | | | | | | | | when action='append', type='str' and default=[]. | ||||
* | | Updates NEWS for issue #15895 | Christian Heimes | 2012-09-11 | 1 | -2/+2 |
| | | |||||
* | | Merge #14617: clarify discussion of interrelationship of __eq__ and __hash__. | R David Murray | 2012-09-11 | 1 | -13/+13 |
|\ \ | |/ | |||||
| * | #14617: clarify discussion of interrelationship of __eq__ and __hash__. | R David Murray | 2012-09-11 | 1 | -13/+13 |
| | | |||||
* | | merge heads | Benjamin Peterson | 2012-09-11 | 1 | -5/+1 |
|\ \ | |||||
| * \ | Fix null pointer dereferencing in structmember.c PyMember_SetOne() for ↵ | Christian Heimes | 2012-09-11 | 1 | -5/+1 |
| |\ \ | | |/ | | | | | | | T_CHAR. _PyUnicode_AsStringAndSize() can return NULL without touching the len argument. Also remove unnecessary PyUnicode_Check(), _PyUnicode_AsStringAndSize() performance the test again. CID 486815 | ||||
| | * | Fix null pointer dereferencing in structmember.c PyMember_SetOne() for ↵ | Christian Heimes | 2012-09-11 | 1 | -5/+1 |
| | | | | | | | | | | | | T_CHAR. _PyUnicode_AsStringAndSize() can return NULL without touching the len argument. Also remove unnecessary PyUnicode_Check(), _PyUnicode_AsStringAndSize() performance the test again. CID 486815 | ||||
* | | | remove useless and defined initialization (closes #15921) | Benjamin Peterson | 2012-09-11 | 1 | -1/+1 |
|/ / | |||||
* | | Issue #15895: my analysis was slightly off. The FILE pointer is only leaked ↵ | Christian Heimes | 2012-09-11 | 2 | -9/+8 |
| | | | | | | | | when set_main_loader() fails for a pyc file with closeit=0. In the success case run_pyc_file() does its own cleanup of the fp. I've changed the code to use another FILE ptr for pyc files and moved the fclose() to PyRun_SimpleFileExFlags() to make it more obvious what's happening. | ||||
* | | Issue #15895: Fix FILE pointer leak in PyRun_SimpleFileExFlags() when ↵ | Christian Heimes | 2012-09-11 | 2 | -1/+8 |
| | | | | | | | | filename points to a pyc/pyo file and closeit is false. | ||||
* | | Spelling past tense -> present tense | Christian Heimes | 2012-09-11 | 1 | -1/+1 |
| | | |||||
* | | Issue #15900: Fixed reference leak in PyUnicode_TranslateCharmap() | Christian Heimes | 2012-09-11 | 2 | -6/+7 |
| | | |||||
* | | merge. Fix issue #15899: Make the unicode.rst doctests pass. Patch by Chris ↵ | Senthil Kumaran | 2012-09-11 | 1 | -14/+13 |
|\ \ | |/ | | | | | Jerdonek. | ||||
| * | Fix issue #15899: Make the unicode.rst doctests pass. Patch by Chris Jerdonek. | Senthil Kumaran | 2012-09-11 | 1 | -14/+13 |
| | | |||||
* | | #15886: remove redundant phrase | R David Murray | 2012-09-11 | 1 | -3/+2 |
| | | |||||
* | | MERGE: Closes #15793: Stack corruption in ssl.RAND_egd() | Jesus Cea | 2012-09-11 | 3 | -7/+6 |
|\ \ | |/ | |||||
| * | Closes #15793: Stack corruption in ssl.RAND_egd() | Jesus Cea | 2012-09-11 | 3 | -7/+6 |
| | | |||||
* | | MERGE: #15676: mmap: add empty file check prior to offset check <- Previous ↵ | Jesus Cea | 2012-09-10 | 1 | -0/+1 |
|\ \ | |/ | | | | | patch was incomplete (fix 2) | ||||
| * | #15676: mmap: add empty file check prior to offset check <- Previous patch ↵ | Jesus Cea | 2012-09-10 | 1 | -0/+1 |
| | | | | | | | | was incomplete (fix 2) | ||||
* | | #15676: mmap: add empty file check prior to offset check <- Previous patch ↵ | Jesus Cea | 2012-09-10 | 2 | -5/+10 |
|\ \ | |/ | | | | | was incomplete | ||||
| * | #15676: mmap: add empty file check prior to offset check <- Previous patch ↵ | Jesus Cea | 2012-09-10 | 2 | -5/+10 |
| | | | | | | | | was incomplete | ||||
* | | MERGE: #15676: Proper attribution in Misc/ACKS | Jesus Cea | 2012-09-10 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | #15676: Proper attribution in Misc/ACKS | Jesus Cea | 2012-09-10 | 1 | -0/+1 |
| | | |||||
* | | Issue #15882: Change _decimal to accept any coefficient tuple when | Stefan Krah | 2012-09-10 | 3 | -7/+21 |
| | | | | | | | | | | | | constructing infinities. This is done for backwards compatibility with decimal.py: Infinity coefficients are undefined in _decimal (in accordance with the specification). | ||||
* | | Fixed reference leak in error branch of _bufferedreader_read_all(). The ↵ | Christian Heimes | 2012-09-10 | 1 | -1/+3 |
| | | | | | | | | variable data can contain a bytes object but it wasn't cleaned up when PyList_New() failed. CID 715364 | ||||
* | | Fixed memory leak in error branch of object_repr which may leak a reference ↵ | Christian Heimes | 2012-09-10 | 1 | -1/+3 |
|\ \ | |/ | | | | | to mod when type_qualname returns NULL. CID 715371 | ||||
| * | Fixed memory leak in error branch of object_repr which may leak a reference ↵ | Christian Heimes | 2012-09-10 | 1 | -1/+3 |
| | | | | | | | | to mod when type_name returns NULL. CID 715371 | ||||
* | | Fixed memory leak in error branch of parsestrplus. CID 715374 Variable s ↵ | Christian Heimes | 2012-09-10 | 1 | -0/+1 |
|\ \ | |/ | | | | | going out of scope leaks the storage it points to. | ||||
| * | Fixed memory leak in error branch of parsestrplus. CID 715374 Variable s ↵ | Christian Heimes | 2012-09-10 | 1 | -0/+1 |
| | | | | | | | | going out of scope leaks the storage it points to. | ||||
* | | Merge #14649: clarify DocTestSuite error when there are no docstrings. | R David Murray | 2012-09-10 | 6 | -6/+84 |
|\ \ | |/ | | | | | | | | | | | Also adds tests to verify the documented behavior (which is probably a bug, as indicated in the added comments). Patch by Chris Jerdonek. | ||||
| * | #14649: clarify DocTestSuite error when there are no docstrings. | R David Murray | 2012-09-10 | 6 | -6/+84 |
| | | | | | | | | | | | | | | Also adds tests to verify the documented behavior (which is probably a bug, as indicated in the added comments). Patch by Chris Jerdonek. | ||||
* | | Null merge for ddb406904be1 backport. | R David Murray | 2012-09-10 | 0 | -0/+0 |
|\ \ | |/ | |||||
| * | backport from the trunk, to fix test_tools with srcdir != builddir | doko@ubuntu.com | 2012-09-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | changeset: 77827:c23b442b5d5e user: Antoine Pitrou <solipsis@pitrou.net> date: Thu Jun 28 01:20:26 2012 +0200 summary: Avoid using scrdir, it's broken. changeset: 77826:f0e58e778215 user: Neil Schemenauer <nas@arctrix.com> date: Wed Jun 27 15:58:37 2012 -0600 summary: Fix bug in test_tools that prevented building is separate directory. | ||||
* | | Added test for 85cb90f79cbf and see how the code handles all flags at once | Christian Heimes | 2012-09-10 | 1 | -0/+5 |
| | | |||||
* | | Merge | Richard Oudkerk | 2012-09-10 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Issue #15901: Change example to use byte string instead of string | Richard Oudkerk | 2012-09-10 | 1 | -1/+1 |
| | | |||||
* | | Added missing va_end in error branch of PyArg_UnpackTuple(). CID 486641 | Christian Heimes | 2012-09-10 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Added missing va_end in error branch of PyArg_UnpackTuple(). CID 486641 | Christian Heimes | 2012-09-10 | 1 | -0/+1 |
| | |