summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | merge from push conflict.Senthil Kumaran2011-04-132-0/+17
| |\ \ \
* | \ \ \ merge from push conflict.Senthil Kumaran2011-04-131-0/+11
|\ \ \ \ \
| * \ \ \ \ mergeRaymond Hettinger2011-04-130-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Issue 11718: Teach IDLE's open module dialog to find packages.Raymond Hettinger2011-04-132-0/+17
| | | | | |
| * | | | | Issue 11718: Teach IDLE's open module dialog to find packages.Raymond Hettinger2011-04-131-0/+11
| | | | | |
* | | | | | merge from 3.2Senthil Kumaran2011-04-131-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge update.Senthil Kumaran2011-04-130-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge updatesSenthil Kumaran2011-04-134-4/+23
| | |\ \ \
| * | \ \ \ merge updateSenthil Kumaran2011-04-134-5/+24
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | merge from 3.1Senthil Kumaran2011-04-131-0/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Update the News for the fix to Issue11703.Senthil Kumaran2011-04-131-0/+3
| | | | | |
* | | | | | Merge #10019: Fix regression relative to 2.6: add newlines if indent=0R David Murray2011-04-134-5/+24
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
| * | | | | Merge #10019: Fix regression relative to 2.6: add newlines if indent=0R David Murray2011-04-134-5/+24
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| | Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
| | * | | #10019: Fix regression relative to 2.6: add newlines if indent=0R David Murray2011-04-134-4/+23
| | |/ / | | | | | | | | | | | | Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
* | | | merge 3.2Benjamin Peterson2011-04-123-0/+8
|\ \ \ \ | |/ / /
| * | | merge 3.1Benjamin Peterson2011-04-123-0/+8
| |\ \ \ | | |/ /
| | * | merge headsBenjamin Peterson2011-04-124-5/+31
| | |\ \
| | * | | make assigning to a bytes literal a syntax error (closes #11506)Benjamin Peterson2011-04-123-0/+8
| | | | |
* | | | | merge the change update.Senthil Kumaran2011-04-121-1/+9
|\ \ \ \ \
| * | | | | Fix #11825: disable regrtest timeout if Python doesn't support threadsVictor Stinner2011-04-121-1/+9
| | | | | |
* | | | | | merge from 3.2Senthil Kumaran2011-04-124-5/+31
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | merge from 3.1Senthil Kumaran2011-04-124-5/+31
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix Issue11703 - urllib2.geturl() does not return correct url when the ↵Senthil Kumaran2011-04-124-5/+31
| | |/ / | | | | | | | | | | | | original url contains #fragment. Patch Contribution by Santoso Wijaya.
* | | | MergeRaymond Hettinger2011-04-120-0/+0
|\ \ \ \ | |/ / /
| * | | MergeRaymond Hettinger2011-04-120-0/+0
| |\ \ \ | | |/ /
| | * | Issue 11747: Fix output format for context diffs.Raymond Hettinger2011-04-122-37/+136
| | | |
| * | | Issue 11747: Fix output format for context diffs.Raymond Hettinger2011-04-122-7/+52
| | | |
* | | | Issue 11747: Fix output format for context diffs.Raymond Hettinger2011-04-122-7/+52
| | | |
* | | | Issue #11186: pydoc ignores a module if its name contains a surrogate characterVictor Stinner2011-04-122-0/+6
| | | | | | | | | | | | | | | | in the index of modules.
* | | | Fix 64-bit safety issue in BZ2Compressor and BZ2Decompressor.Nadeem Vawda2011-04-122-10/+59
| | | |
* | | | Merge: Add maxlinelen to docstring, delete obsolete wordingR David Murray2011-04-121-6/+6
|\ \ \ \ | |/ / /
| * | | Merge: Add maxlinelen to docstring, delete obsolete wordingR David Murray2011-04-121-6/+6
| |\ \ \ | | |/ /
| | * | Add maxlinelen to docstring, delete obsolete wordingR David Murray2011-04-121-6/+6
| | | |
* | | | Issue #11815: Use a light-weight SimpleQueue for the result queue in ↵Antoine Pitrou2011-04-122-2/+6
| | | | | | | | | | | | | | | | concurrent.futures.ProcessPoolExecutor.
* | | | Issue #11815: Remove dead code in concurrent.futures (since a blocking QueueAntoine Pitrou2011-04-122-52/+29
|\ \ \ \ | |/ / / | | | | | | | | cannot raise queue.Empty).
| * | | Issue #11815: Remove dead code in concurrent.futures (since a blocking QueueAntoine Pitrou2011-04-122-52/+29
| | | | | | | | | | | | | | | | cannot raise queue.Empty).
* | | | Fix markup.Raymond Hettinger2011-04-121-2/+2
| | | |
* | | | Dummy mergeBrian Curtin2011-04-110-0/+0
|\ \ \ \ | |/ / /
| * | | Dummy mergeBrian Curtin2011-04-110-0/+0
| |\ \ \ | | |/ /
| | * | Correct leading spaces in my NEWS entry.Brian Curtin2011-04-111-2/+2
| | | |
* | | | Add NEWS item for #5162.brian.curtin2011-04-111-0/+3
|\ \ \ \ | |/ / /
| * | | Add NEWS item for #5162.brian.curtin2011-04-111-0/+3
| |\ \ \ | | |/ /
| | * | Add NEWS item for #5162.brian.curtin2011-04-111-0/+3
| | | |
* | | | Fix #5162. Allow child spawning from Windows services (via pywin32).brian.curtin2011-04-111-2/+3
|\ \ \ \ | |/ / /
| * | | Fix #5162. Allow child spawning from Windows services (via pywin32).brian.curtin2011-04-111-2/+3
| |\ \ \ | | |/ /
| | * | Fix #5162. Allow child spawning from Windows services (via pywin32).brian.curtin2011-04-111-2/+3
| | | |
* | | | Issue #11747: Fix range formatting in context and unified diffs.Raymond Hettinger2011-04-113-11/+42
|\ \ \ \ | |/ / /
| * | | Issue #11747: Fix range formatting in context and unified diffs.Raymond Hettinger2011-04-113-11/+42
| | | |
* | | | Whitespace normalized.Vinay Sajip2011-04-111-1/+1
| | | |
* | | | Added 'handlers' argument to logging.basicConfig.Vinay Sajip2011-04-114-10/+73
| | | |