summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge highlight and spacing fixes in json example with 3.2.Ezio Melotti2012-04-141-4/+4
|\
| * Fix highlight and spacing in json example.Ezio Melotti2012-04-141-4/+4
* | #14535: merge with 3.2.Ezio Melotti2012-04-141-1/+4
|\ \ | |/
| * #14535: fix code highlight in multiprocessing examples. Patch by Tshepang Le...Ezio Melotti2012-04-141-1/+4
* | Merge #14399: corrected news itemR David Murray2012-04-141-4/+4
|\ \ | |/
| * #14399: corrected news itemR David Murray2012-04-141-4/+4
* | merge 3.2Benjamin Peterson2012-04-131-2/+2
|\ \ | |/
| * move outside WITH_THREAD conditionalBenjamin Peterson2012-04-131-2/+2
* | Fix clock_gettime/getres/settime: PyArg_ParseTuple() expects an intVictor Stinner2012-04-131-10/+4
* | Minor docstring / docs corrections for unittest.mockMichael Foord2012-04-133-11/+11
* | Make unittest.mock.create_autospec resilient against AttributeError on origin...Michael Foord2012-04-132-2/+29
* | merge 3.2Benjamin Peterson2012-04-131-4/+3
|\ \ | |/
| * take linkage def outside of WITH_THREAD conditional (closes #14569)Benjamin Peterson2012-04-131-4/+3
| * merge headsAmaury Forgeot d'Arc2012-04-133-0/+11
| |\
| * | #14399: zipfile now correctly handles comments added to empty zipfiles.R David Murray2012-04-124-11/+50
* | | unittest.mock.PropertyMock return value and attributes are now standard Magic...Michael Foord2012-04-133-0/+25
* | | put PyImportErrorObject with its brothersBenjamin Peterson2012-04-131-7/+7
* | | MergeBrett Cannon2012-04-133-0/+11
|\ \ \
| * \ \ merge headsAmaury Forgeot d'Arc2012-04-133-0/+11
| |\ \ \
| | * \ \ Merge headsAmaury Forgeot d'Arc2012-04-133-11/+49
| | |\ \ \
| | * \ \ \ hg merge 3.2Amaury Forgeot d'Arc2012-04-133-0/+11
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Issue14559: Fix build files old Microft compilers.Amaury Forgeot d'Arc2012-04-133-0/+11
| | | | |/ | | | |/|
* | | | | NEWS entry about importlib and ImportError's new attributes.Brett Cannon2012-04-131-0/+3
* | | | | Have importlib take advantage of ImportError's new 'name' and 'path'Brett Cannon2012-04-139-41/+76
|/ / / /
* | | | Issue #1559549: Add 'name' and 'path' attributes to ImportError.Brett Cannon2012-04-136-3/+192
| |_|/ |/| |
* | | Merge #14399: zipfile now correctly handles comments added to empty zipfiles.R David Murray2012-04-123-11/+49
|/ /
* | Doc: sort time.CLOCK_xxx constantsVictor Stinner2012-04-121-8/+8
* | Null-merge 3.2 branch.Georg Brandl2012-04-120-0/+0
|\ \ | |/
| * 3.2 sidebar: link to 3.3, not 3.1Georg Brandl2012-04-121-1/+1
* | Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban.Charles-François Natali2012-04-123-0/+7
|\ \ | |/
| * Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban.Charles-François Natali2012-04-123-0/+7
* | code improvement. 'as cm' not required when not used. Review comment by Georg...Senthil Kumaran2012-04-121-7/+7
* | Merge doc fixes #14553 and #14552.R David Murray2012-04-122-4/+4
|\ \ | |/
| * #14553: fix word order.R David Murray2012-04-121-1/+1
| * #14552: remove redundant wording in 'test' docs.R David Murray2012-04-121-3/+3
* | merge 3.2 (null)Benjamin Peterson2012-04-110-0/+0
|\ \ | |/
| * merge 3.1 (null)Benjamin Peterson2012-04-110-0/+0
| |\
| | * after 3.1.5Benjamin Peterson2012-04-112-1/+13
* | | #14508: make gprof2html script runnable under python3R David Murray2012-04-112-6/+31
|\ \ \ | |/ /
| * | #14508: make gprof2html script runnable under python3R David Murray2012-04-111-5/+7
* | | merge to default - Issue 10484 - Incorporate improvements to CGI module - Sug...Senthil Kumaran2012-04-112-51/+56
|\ \ \ | |/ /
| * | 3.2 - Issue 10484 - Incorporate improvements to CGI module - Suggested by Gle...Senthil Kumaran2012-04-112-51/+56
* | | Improve the threading.Condition docs.Antoine Pitrou2012-04-111-3/+5
|\ \ \ | |/ /
| * | Improve the threading.Condition docs.Antoine Pitrou2012-04-111-3/+5
* | | #14545: merge 3.2Georg Brandl2012-04-111-2/+2
|\ \ \ | |/ /
| * | Closes #14545: make clearer what was added.Georg Brandl2012-04-111-2/+2
* | | Merge 3.2Georg Brandl2012-04-111-0/+1
|\ \ \ | |/ /
| * | Merge 3.2.3 release clone.Georg Brandl2012-04-118-13/+15
| |\ \
| | * | Post-release update.Georg Brandl2012-04-111-1/+1
| | * | Added tag v3.2.3 for changeset 3d0686d90f55Georg Brandl2012-04-101-0/+1