summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Issue #10576: Add a progress callback to gcmoduleKristján Valur Jónsson2012-04-154-9/+249
* Merge with 3.2: use ws2_32.lib rather than wsock32.lib on windows.Kristján Valur Jónsson2012-04-154-26/+26
|\
| * Make all socket related modules link with ws2_32.lib on windows, likeKristján Valur Jónsson2012-04-154-26/+26
* | Merge with remote.Ross Lagerwall2012-04-151-4/+5
|\ \
| * | Be less verbose when building dbm.Ross Lagerwall2012-04-151-4/+5
* | | Plug a refleak.Brett Cannon2012-04-151-2/+1
|/ /
* | Clarify that one should not use __import__() directly. Also mentionBrett Cannon2012-04-151-3/+5
* | Handle importing pkg.mod by executingBrett Cannon2012-04-154-253/+276
* | Rebuild importlib.h to incorporate added comments.Brett Cannon2012-04-151-30/+30
* | IDLE was relying on implicit relative imports which have gone away inBrett Cannon2012-04-151-3/+7
* | Add some comments.Brett Cannon2012-04-141-0/+2
* | merge with the tipBrian Curtin2012-04-141-2/+2
|\ \
| * | Fix an import race condition.Brett Cannon2012-04-141-2/+2
* | | Fix Windows buildBrian Curtin2012-04-141-3/+4
|/ /
* | Try to fix a sporadic test failure from what is probably a caching race condi...Brett Cannon2012-04-141-0/+1
* | Undo a C99 idiom.Brett Cannon2012-04-141-2/+2
* | Issue #2377: Make importlib the implementation of __import__().Brett Cannon2012-04-1438-599/+3597
* | merge with 3.2Sandro Tosi2012-04-141-1/+1
|\ \ | |/
| * fix typo; thanks to Jérôme Mainka from docs@Sandro Tosi2012-04-141-1/+1
* | 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