summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge redundant __contains__ doc fix from 3.2.R David Murray2011-03-151-6/+0
|\
| * Merge redundant __contains__ doc fix from 3.1.R David Murray2011-03-151-6/+0
| |\
| | * Remove redundant __contains__ entry from Message docs.R David Murray2011-03-151-6/+0
| | |
* | | Merge long Japanese header fix from 3.2.R David Murray2011-03-152-1/+15
|\ \ \ | |/ /
| * | Fix header encoding of long headers when using euc-jp and shift_jis.R David Murray2011-03-152-1/+15
| | | | | | | | | | | | | | | | | | | | | When a header was long enough to need to be split across lines, the input charset name was used instead of the output charset name in the encoded words. This make a difference only for the two charsets above.
* | | Merge with hg.python.org.Reid Kleckner2011-03-1416-66/+222
|\ \ \
| * \ \ merge defaultMichael Foord2011-03-144-0/+40
| |\ \ \
| | * \ \ Merge with remoteNick Coghlan2011-03-145-52/+99
| | |\ \ \
| | * | | | Close #11505: Improve string.py coverageNick Coghlan2011-03-144-0/+40
| | | | | |
| * | | | | Closes issue 11407. TestCase.run returns the result object used or createdMichael Foord2011-03-145-7/+49
| | |/ / / | |/| | |
| * | | | Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified ↵Ronald Oussoren2011-03-143-49/+93
| |\ \ \ \ | | | |/ / | | |/| | | | | | | IP addresses in the proxy exception list.
| | * | | Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified ↵Ronald Oussoren2011-03-143-49/+93
| | |\ \ \ | | | | |/ | | | |/| | | | | | IP addresses in the proxy exception list.
| | | * | Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified ↵Ronald Oussoren2011-03-143-49/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IP addresses in the proxy exception list Patch by Scott Wilson.
| | | * | Fix #11491. When dbm.open was called with a file which already exists andbriancurtin2011-03-144-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the "flag" argument is "n", dbm.error was being raised. As documented, dbm.open(...,flag='n') will now "Always create a new, empty database, open for reading and writing", regardless of a previous file existing.
| * | | | Merge linesep docstring changes from 3.2.R David Murray2011-03-142-3/+6
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Harmonize linesep docstrings, and fix the quoting of \r\nR David Murray2011-03-142-3/+6
| | | |
| * | | Merge #11496 from 3.2.R David Murray2011-03-141-0/+4
| |\ \ \ | | |/ /
| | * | #11496: skip history test if clear_history is not available.R David Murray2011-03-142-0/+5
| | | | | | | | | | | | | | | | Patch by Natalia B. Bidart.
| * | | Fix #11491. When dbm.open was called with a file which already exists andbriancurtin2011-03-144-3/+16
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | the "flag" argument is "n", dbm.error was being raised. As documented, dbm.open(...,flag='n') will now "Always create a new, empty database, open for reading and writing", regardless of a previous file existing.
| | * | Fix #11491. When dbm.open was called with a file which already exists andbriancurtin2011-03-144-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | the "flag" argument is "n", dbm.error was being raised. As documented, dbm.open(...,flag='n') will now "Always create a new, empty database, open for reading and writing", regardless of a previous file existing.
| * | | whitespace fixGregory P. Smith2011-03-141-1/+1
| | | |
| * | | merge defaultGregory P. Smith2011-03-141-1/+1
| |\ \ \
| * | | | Add a SubprocessError base class for exceptions in the subprocess module.Gregory P. Smith2011-03-142-4/+14
| | | | |
* | | | | Tweak subprocess test timeouts to satisfy the buildbot.Reid Kleckner2011-03-141-2/+2
| |/ / / |/| | |
* | | | Attempt a larger timeout value to satisfy the buildbots.Reid Kleckner2011-03-141-1/+1
|/ / /
* | | Dummy merge with 3.2.Ezio Melotti2011-03-140-0/+0
|\ \ \ | |/ /
| * | Skip test that requires zlib when zlib is not available.Ezio Melotti2011-03-141-0/+1
| | |
* | | Merged with default.Reid Kleckner2011-03-1414-174/+8
|\ \ \
| * | | Issue #11495: OSF support is eliminated. It was deprecated in Python 3.2Jesus Cea2011-03-1414-174/+8
| | | |
* | | | Change versionchanged for timeout to 3.3, not 3.2.Reid Kleckner2011-03-141-5/+5
|/ / /
* | | Merge with default.Reid Kleckner2011-03-142-12/+9
|\ \ \
| * \ \ mergeRonald Oussoren2011-03-143-3/+5
| |\ \ \
| * \ \ \ Issue #1099: Fix the build on MacOSX when building a framework with pydebugRonald Oussoren2011-03-142-12/+9
| |\ \ \ \ | | | |/ / | | |/| | | | | | | using GCC 4.0.
| | * | | Issue #1099: Fix the build on MacOSX when building a framework with pydebug ↵Ronald Oussoren2011-03-142-12/+9
| | |\ \ \ | | | | |/ | | | |/| | | | | | using GCC 4.0.
| | | * | Fixes #1099: Mac compile fails with pydebug and framework enabledRonald Oussoren2011-03-142-12/+9
| | | | | | | | | | | | | | | | | | | | Without this patch "./configure --with-pydebug --enable-framework CC=gcc-4.0" fails on MacOSX
* | | | | Merge with default.Reid Kleckner2011-03-143-1/+3
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Skip test if zlib not present. Closes #11498. Patch by Natalia B. Bidart.Eric V. Smith2011-03-143-1/+3
| | | | |
* | | | | Add a 'timeout' argument to subprocess.Popen.Reid Kleckner2011-03-144-98/+367
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | If the timeout expires before the subprocess exits, the wait method and the communicate method will raise a subprocess.TimeoutExpired exception. When used with communicate, it is possible to catch the exception, kill the process, and retry the communicate and receive any output written to stdout or stderr.
* | | | Typos.Eric V. Smith2011-03-141-2/+2
|/ / /
* | | Merge #11488 patch from 3.2.R David Murray2011-03-142-0/+18
|\ \ \ | |/ /
| * | Merge #11488 patch from 3.1.R David Murray2011-03-142-0/+18
| |\ \ | | |/
| | * #11488: Add tests for writelines method of SpooledTemporaryFile.R David Murray2011-03-142-0/+18
| | | | | | | | | | | | Patch by Evan Dandrea.
* | | Merge with 3.2Ross Lagerwall2011-03-141-1/+1
|\ \ \ | |/ /
| * | Merge from 3.1Ross Lagerwall2011-03-141-1/+1
| |\ \ | | |/
| | * Issue #10885: Fix multiprocessing docs typoRoss Lagerwall2011-03-141-1/+1
| | |
* | | Merge whitespace fix from 3.2.R David Murray2011-03-141-1/+1
|\ \ \ | |/ /
| * | Fix whitespaceR David Murray2011-03-141-1/+1
| | |
* | | Merge fix for #11490 from 3.2.R David Murray2011-03-142-1/+5
|\ \ \ | |/ /
| * | Merge fix for #11490 from 3.1.R David Murray2011-03-142-1/+5
| |\ \ | | |/
| | * #11490: EACCES can also mean command not foundR David Murray2011-03-142-1/+5
| | |