summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge doc updateAntoine Pitrou2011-03-152-2/+7
|\
| * Followup to 4c59cd84086f: add an entry in the porting guide and a "versioncha...Antoine Pitrou2011-03-152-2/+7
* | Merge #11555 as_string doc fix from 3.2.R David Murray2011-03-152-5/+5
|\ \ | |/
| * Merge #11555 as_string doc fix from 3.1.R David Murray2011-03-152-5/+5
| |\
| | * #11555: update doc for 3.x change to as_string mangle_from default.R David Murray2011-03-152-5/+5
* | | Merge with 3.2Ezio Melotti2011-03-154-6/+6
|\ \ \ | |/ /
| * | Merge with 3.2Ezio Melotti2011-03-154-6/+6
| |\ \ | | |/
| | * Revert typo fixes in _cytpes/libffi*Ezio Melotti2011-03-152-1721/+1721
* | | Merge obsolete comment removal from 3.2.R David Murray2011-03-151-1/+1
|\ \ \ | |/ /
| * | Remove obsolete comment.R David Murray2011-03-151-1/+1
* | | Merge #11554 test_email_codecs activation from 3.2.R David Murray2011-03-157-22/+54
|\ \ \ | |/ /
| * | #11554: reactivate test_email_codecs, and make it pass.R David Murray2011-03-157-22/+54
* | | Add news item for #11509.briancurtin2011-03-151-0/+3
* | | Adjust test names to be more descriptive instead of depending on capitalization.briancurtin2011-03-151-4/+4
* | | import style nitsBenjamin Peterson2011-03-151-8/+13
* | | Fix #11509. Significantly increase test coverage for fileinput.briancurtin2011-03-151-15/+605
* | | Typo.Eric V. Smith2011-03-151-1/+1
* | | merge 1579808ef25bGregory P. Smith2011-03-151-2/+5
|\ \ \ | |/ /
| * | merge 141bbcb19c06Gregory P. Smith2011-03-151-2/+5
| |\ \ | | |/
| | * Fix the @test_NNNN_tmp file terds being left in whatever your $PWD wasGregory P. Smith2011-03-151-2/+5
* | | #11515: Merge with 3.2.Ezio Melotti2011-03-1550-59/+59
|\ \ \ | |/ /
| * | #11515: Merge with 3.1.Ezio Melotti2011-03-1549-58/+58
| |\ \ | | |/
| | * #11515: fix several typos. Patch by Piotr Kasprzyk.Ezio Melotti2011-03-1541-1770/+1771
* | | 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
* | | 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 I...Ronald Oussoren2011-03-143-49/+93
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified I...Ronald Oussoren2011-03-143-49/+93
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified I...Ronald Oussoren2011-03-143-49/+93
| | | * | Fix #11491. When dbm.open was called with a file which already exists andbriancurtin2011-03-144-3/+16
| * | | | 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
| * | | Fix #11491. When dbm.open was called with a file which already exists andbriancurtin2011-03-144-3/+16
| |\ \ \ | | |/ /
| | * | Fix #11491. When dbm.open was called with a file which already exists andbriancurtin2011-03-144-3/+16
| * | | 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