summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.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 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
|\ \ | |/
| * 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
| |
* | 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: Remove dead code in concurrent.futures (since a blocking QueueAntoine Pitrou2011-04-122-52/+29
| | | | | | | | cannot raise queue.Empty).
* | 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
| |
* | 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
| |
* | Remove unnecessary call to PyErr_Clear.Ezio Melotti2011-04-111-1/+0
| |
* | Cleanup and modernize code prior to working on Issue 11747.Raymond Hettinger2011-04-111-26/+27
| |
* | Issue #11814: Fix likely typo in multiprocessing.Pool._terminate().Antoine Pitrou2011-04-102-1/+3
| |
* | Issue #8428: Fix a race condition in multiprocessing.Pool when terminatingAntoine Pitrou2011-04-102-2/+11
| | | | | | | | | | worker processes: new processes would be spawned while the pool is being shut down. Patch by Charles-François Natali.
* | Issue #11818: Fix tempfile examples for Python 3.Ross Lagerwall2011-04-102-5/+10
| |
* | Beautify and modernize the SequenceMatcher exampleRaymond Hettinger2011-04-101-7/+9
| |
* | Issue9670: Merge backout to 3.2.Ned Deily2011-04-093-47/+0
|\ \ | |/
| * Issue9670: Back out changeset 378b40d71175; test fails on other platformsNed Deily2011-04-093-47/+0
| | | | | | | | and on OS X with pydebug.
* | Issue #9670: merge with 3.2Ned Deily2011-04-093-0/+47
|\ \ | |/
| * Issue #9670: Increase the default stack size for secondary threads onNed Deily2011-04-093-0/+47
| | | | | | | | | | | | Mac OS X and FreeBSD to reduce the chances of a crash instead of a "maximum recursion depth" RuntimeError exception. (Patch by Ronald Oussoren)
* | Merge with 3.1Ross Lagerwall2011-04-092-1/+4
|\ \ | |/
| * Issue #11719: Fix message about unexpected test_msilib skip.Ross Lagerwall2011-04-092-1/+4
| | | | | | | | Patch by Nadeem Vawda.
* | (Merge 3.1) Issue #11650: PyOS_StdioReadline() retries fgets() if it wasVictor Stinner2011-04-092-45/+53
|\ \ | |/ | | | | | | interrupted (EINTR), for example if the program is stopped with CTRL+z on Mac OS X. Patch written by Charles-Francois Natali.
| * Issue #11650: PyOS_StdioReadline() retries fgets() if it was interruptedVictor Stinner2011-04-092-4/+9
| | | | | | | | | | (EINTR), for example if the program is stopped with CTRL+z on Mac OS X. Patch written by Charles-Francois Natali.
* | Merge #11492: fix header truncation on folding when there are runs of split ↵R David Murray2011-04-082-3/+14
|\ \ | |/ | | | | | | | | chars. Not a complete fix for this issue.
| * #11492: fix header truncation on folding when there are runs of split chars.R David Murray2011-04-082-3/+14
| | | | | | | | Not a complete fix for this issue.
* | Merge: Improve test coverage of _split_ascii method.R David Murray2011-04-081-0/+43
|\ \ | |/
| * Improve test coverage of _split_ascii method.R David Murray2011-04-081-0/+43
| |
* | Normalised whitespace.Vinay Sajip2011-04-081-1/+1
| |
* | Updated Formatter documentation.Vinay Sajip2011-04-081-2/+9
| |
* | #7311: fix html.parser to accept non-ASCII attribute values.Ezio Melotti2011-04-073-1/+20
| |
* | Refinement by Stefan Krah (see issue 11715, msg133194) to exit early if theBarry Warsaw2011-04-071-0/+2
|\ \ | |/ | | | | | | | | dpkg-architecture command is not found on $PATH. This should fix the failures on FreeBSD and Solaris, which do not create the target file via I/O redirection if the command isn't found (unlike Linux and OS X which do).
| * Refinement by Stefan Krah (see issue 11715, msg133194) to exit early if theBarry Warsaw2011-04-071-0/+2
| | | | | | | | | | | | dpkg-architecture command is not found on $PATH. This should fix the failures on FreeBSD and Solaris, which do not create the target file via I/O redirection if the command isn't found (unlike Linux and OS X which do).
* | Removed 'or long integer' from bin, oct, and hex docstrings.Alexander Belopolsky2011-04-071-3/+3
| |
* | Issue #11766: increase countdown waiting for a pool of processes to startAntoine Pitrou2011-04-061-1/+2
| | | | | | | | up. Hopefully fixes transient buildbot failures.
* | Issue 11715: Merge multiarch fix from 3.1 branch.Barry Warsaw2011-04-061-0/+21
|\ \ | |/
| * Issue 11715: Build extension modules on multiarch Debian and Ubuntu byBarry Warsaw2011-04-061-0/+21
| | | | | | | | extending search paths to include multiarch directories.
* | #11605: don't use set/get_payload in feedparser; they do conversions.R David Murray2011-04-063-2/+52
| | | | | | | | | | Really the whole API needs to be gone over to restore the separation of concerns; but that's what email6 is about.
* | Merge from 3.1Senthil Kumaran2011-04-062-1/+9
|\ \ | |/
| * Issue #10762: Guard against invalid/non-supported format string '%f' on ↵Senthil Kumaran2011-04-062-1/+9
| | | | | | | | Windows. Patch Santoso Wijaya.