summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* mergeBrett Cannon2013-01-110-0/+0
|\
| * mergeBrett Cannon2013-01-113-16/+21
| |\
* | \ mergeBrett Cannon2013-01-113-16/+21
|\ \ \
| * \ \ Issue #15539: Fix a backup file creation in pindent.py on Windows.Serhiy Storchaka2013-01-112-12/+21
| |\ \ \ | | | |/ | | |/|
| | * | Issue #15539: Fix a backup file creation in pindent.py on Windows.Serhiy Storchaka2013-01-112-12/+21
| | |\ \
| | | * | Issue #15539: Fix a backup file creation in pindent.py on Windows.Serhiy Storchaka2013-01-112-12/+21
| * | | | merge with 3.3Georg Brandl2013-01-111-4/+0
| |\ \ \ \ | | |/ / /
| | * | | Closes #16936: fix duplicate/ambiguous description of stat.S_IFMT in the docs.Georg Brandl2013-01-111-4/+0
* | | | | Merge from 3.3 for fix for issue #16730Brett Cannon2013-01-114-940/+984
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Issue #16730: Don't raise an exception inBrett Cannon2013-01-114-945/+989
| |/ /
* | | Issue #3583: mention that testing whether a bad address not triggeringBrett Cannon2013-01-111-10/+9
* | | #16921 Since Win9x is no longer supported, CREATE_NEW_CONSOLE isTim Golden2013-01-111-2/+0
* | | Merge patchcheck changes with 3.3Ezio Melotti2013-01-111-1/+2
|\ \ \ | |/ /
| * | Merge patchcheck changes with 3.2Ezio Melotti2013-01-111-1/+2
| |\ \ | | |/
| | * Add a note about checking refleaks to patchcheck.Ezio Melotti2013-01-111-1/+2
* | | Null mergeSerhiy Storchaka2013-01-110-0/+0
|\ \ \ | |/ /
| * | Null mergeSerhiy Storchaka2013-01-110-0/+0
| |\ \ | | |/
| | * Merge headsSerhiy Storchaka2013-01-111-1/+1
| | |\
| * | \ Merge headsSerhiy Storchaka2013-01-113-105/+392
| |\ \ \
* | \ \ \ Merge headsSerhiy Storchaka2013-01-111-1/+1
|\ \ \ \ \
| * \ \ \ \ merge with 3.3Sandro Tosi2013-01-111-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | merge with 3.2Sandro Tosi2013-01-111-1/+1
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | grammatical fix; thanks to Alex Rudnick from docs@Sandro Tosi2013-01-111-1/+1
* | | | | | Issue #15539: Fix a number of bugs in Tools/scripts/pindent.py.Serhiy Storchaka2013-01-113-105/+392
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Issue #15539: Fix a number of bugs in Tools/scripts/pindent.py.Serhiy Storchaka2013-01-113-105/+392
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Issue #15539: Fix a number of bugs in Tools/scripts/pindent.py.Serhiy Storchaka2013-01-113-105/+392
| | |/
* | | #16154: merge with 3.3.Ezio Melotti2013-01-115-8/+11
|\ \ \ | |/ /
| * | #16154: merge with 3.2.Ezio Melotti2013-01-115-8/+11
| |\ \ | | |/
| | * #16154: fix some doctests in Doc/library. Patch by Ravi Sinha.Ezio Melotti2013-01-115-10/+13
* | | Issue #16874 (merge from 3.3): fix some documentation formatting.Chris Jerdonek2013-01-111-6/+6
|\ \ \ | |/ /
| * | Issue #16874 (merge from 3.2): fix some documentation formatting.Chris Jerdonek2013-01-111-6/+6
| |\ \ | | |/
| | * Issue #16874 (forward-port from 2.7): fix some documentation formatting.Chris Jerdonek2013-01-111-6/+6
* | | #13899: merge with 3.3.Ezio Melotti2013-01-113-1/+10
|\ \ \ | |/ /
| * | #13899: merge with 3.2.Ezio Melotti2013-01-113-1/+10
| |\ \ | | |/
| | * #13899: \A, \Z, and \B now correctly match the A, Z, and B literals when used...Ezio Melotti2013-01-114-1/+11
* | | #16925: merge with 3.3.Ezio Melotti2013-01-112-35/+16
|\ \ \ | |/ /
| * | #16925: test_configparser now works with unittest test discovery. Patch by Za...Ezio Melotti2013-01-112-35/+16
* | | #16918: merge with 3.3.Ezio Melotti2013-01-112-46/+16
|\ \ \ | |/ /
| * | #16918: test_codecs now works with unittest test discovery. Patch by Zachary ...Ezio Melotti2013-01-112-46/+15
| * | Merge fix for broken/disabled test.Ezio Melotti2013-01-111-1/+2
| |\ \ | | |/
| | * Enable a broken test and fix it.Ezio Melotti2013-01-111-1/+2
* | | #16919: merge with 3.3.Ezio Melotti2013-01-112-5/+9
|\ \ \ | |/ /
| * | #16919: test_crypt now works with unittest test discovery. Patch by Zachary W...Ezio Melotti2013-01-112-5/+9
* | | merge #13934: document sqlite version strings, use correct one in test.R David Murray2013-01-112-2/+24
|\ \ \ | |/ /
| * | merge #13934: document sqlite version strings, use correct one in test.R David Murray2013-01-112-2/+24
| |\ \ | | |/
| | * #13934: document sqlite version strings, use correct one in test.R David Murray2013-01-112-2/+24
* | | merge 3.3 (#16900)Benjamin Peterson2013-01-103-4/+10
|\ \ \ | |/ /
| * | remove __del__ because it's evil and also prevents the ResourceWarning on the...Benjamin Peterson2013-01-103-4/+10
* | | merge #15545: fix sqlite3.iterdump regression on unsortable row_factory objects.R David Murray2013-01-103-1/+27
|\ \ \ | |/ /
| * | merge #15545: fix sqlite3.iterdump regression on unsortable row_factory objects.R David Murray2013-01-103-1/+27
| |\ \ | | |/