summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge issue #16373: Prevent infinite recursion for ABC Set class operations.Andrew Svetlov2012-11-012-2/+35
|\
| * Merge issue #16373: Prevent infinite recursion for ABC Set class operations.Andrew Svetlov2012-11-012-2/+35
| |\
| | * Issue #16373: Prevent infinite recursion for ABC Set class operations.Andrew Svetlov2012-11-012-2/+35
* | | merge headsBenjamin Peterson2012-11-011-6/+17
|\ \ \
| * | | Closes #16366: Improve diagnostics from handleError(). Thanks to Antoine Pitr...Vinay Sajip2012-10-311-6/+17
* | | | point errors related to nonlocals and globals to the statement declaring them...Benjamin Peterson2012-11-013-8/+53
|/ / /
* | | merge 3.3Benjamin Peterson2012-10-310-0/+0
|\ \ \ | |/ /
| * | merge headsBenjamin Peterson2012-10-313-111/+149
| |\ \
* | \ \ merge headsBenjamin Peterson2012-10-317-229/+227
|\ \ \ \
| * | | | Issue #15441, #15478: Reenable test_nonascii_abspath() on WindowsVictor Stinner2012-10-311-8/+4
| * | | | Issue #15478: Use source filename in OSError, not destination filenameVictor Stinner2012-10-312-47/+53
| * | | | Issue #15478: Fix again to fix test_os on WindowsVictor Stinner2012-10-312-5/+8
| * | | | Issue #15478: Use path_error() in more posix functions, especially in WindowsVictor Stinner2012-10-311-69/+24
| * | | | Merge issue #16377: Fix bisect unittest.Andrew Svetlov2012-10-311-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge issue #16377: Fix bisect unittest.Andrew Svetlov2012-10-311-1/+1
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Issue #16377: Fix bisect unittest.Andrew Svetlov2012-10-311-1/+1
| * | | | null mergeAndrew Svetlov2012-10-310-0/+0
| |\ \ \ \ | | |/ / /
| | * | | null mergeAndrew Svetlov2012-10-310-0/+0
| | |\ \ \ | | | |/ /
| | | * | merge headsAndrew Svetlov2012-10-311-104/+133
| | | |\ \
| * | | \ \ Issue #14900: document added sort keys for profile stats.Andrew Svetlov2012-10-311-104/+133
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge issue #14900: document added sort keys for profile stats.Andrew Svetlov2012-10-311-104/+133
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Issue #14900: document added sort keys for profile stats.Andrew Svetlov2012-10-311-104/+133
| * | | | | Issue #16348: merge fix from 3.3.Mark Dickinson2012-10-311-6/+15
| |\ \ \ \ \ | | |/ / / /
| | * | | | Issue #16348: merge fix from 3.2.Mark Dickinson2012-10-311-6/+15
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Issue #16348: Fix incorrect documentation for Decimal.remainder_near.Mark Dickinson2012-10-311-6/+15
* | | | | | merge 3.3Benjamin Peterson2012-10-311-2/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | check return value of _PyUnicode_AsStringBenjamin Peterson2012-10-311-2/+6
| |/ / /
* | | | merge 3.3Benjamin Peterson2012-10-311-1/+1
|\ \ \ \ | |/ / /
| * | | merge 3.2Benjamin Peterson2012-10-311-1/+1
| |\ \ \ | | |/ /
| | * | avoid a function call with redundant checks for dict sizeBenjamin Peterson2012-10-311-1/+1
* | | | merge 3.3Benjamin Peterson2012-10-311-1/+1
|\ \ \ \ | |/ / /
| * | | merge 3.2Benjamin Peterson2012-10-311-1/+1
| |\ \ \ | | |/ /
| | * | fix spellingBenjamin Peterson2012-10-311-1/+1
* | | | merge 3.3 (#16345)Benjamin Peterson2012-10-313-29/+41
|\ \ \ \ | |/ / /
| * | | merge 3.2 (#16345)Benjamin Peterson2012-10-313-29/+41
| |\ \ \ | | |/ /
| | * | merge headsBenjamin Peterson2012-10-316-21/+18
| | |\ \ | | | |/
| | * | only fast-path fromkeys() when the constructor returns a empty dict (closes #...Benjamin Peterson2012-10-313-33/+45
* | | | Issue #13701: Fix decorator avoidance (due to desire for Python 2.3 compatibi...Mark Dickinson2012-10-311-3/+1
* | | | merge headsBenjamin Peterson2012-10-319-53/+54
|\ \ \ \
| * \ \ \ Merge issue #16197: Fix several small errors in winreg documentation.Andrew Svetlov2012-10-312-31/+34
| |\ \ \ \ | | |/ / /
| | * | | Issue #16197: Fix several small errors in winreg documentation.Andrew Svetlov2012-10-312-31/+34
| * | | | MERGE: Closes #16369: Global PyTypeObjects not initialized with PyType_Ready(...Jesus Cea2012-10-311-0/+2
| |\ \ \ \ | | |/ / /
| | * | | MERGE: Closes #16369: Global PyTypeObjects not initialized with PyType_Ready(...Jesus Cea2012-10-311-0/+2
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Closes #16369: Global PyTypeObjects not initialized with PyType_Ready(...). D...Jesus Cea2012-10-311-0/+2
| * | | | merge #16371: fix up the English a bit more.R David Murray2012-10-311-2/+2
| |\ \ \ \ | | |/ / /
| | * | | merge #16371: fix up the English a bit more.R David Murray2012-10-311-2/+2
| | |\ \ \ | | | |/ /
| | | * | #16371: fix up the English a bit more.R David Murray2012-10-311-2/+2
| * | | | Merge issue #16371: fix typo in ctypes documentation.Andrew Svetlov2012-10-311-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge issue #16371: fix typo in ctypes documentation.Andrew Svetlov2012-10-311-1/+1
| | |\ \ \ | | | |/ /
| | | * | Issue #16371: fix typo in ctypes documentation.Andrew Svetlov2012-10-311-1/+1