summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge issue #14570: Document json sort_keys parameter properly.Andrew Svetlov2012-10-282-8/+23
|\ | | | | | | Patch by Chris Rebert.
| * Merge issue #14570: Document json sort_keys parameter properly.Andrew Svetlov2012-10-282-8/+23
| |\ | | | | | | | | | Patch by Chris Rebert.
| | * Issue #14570: Document json sort_keys parameter properly.Andrew Svetlov2012-10-282-8/+23
| | | | | | | | | | | | Patch by Chris Rebert.
* | | Issue #14700: merge tests from 3.3.Mark Dickinson2012-10-281-0/+27
|\ \ \ | |/ /
| * | Issue #14700: merge tests from 3.2.Mark Dickinson2012-10-281-0/+27
| |\ \
| | * | Issue #14700: Fix buggy overflow checks for large precision and width in ↵Mark Dickinson2012-10-285-20/+45
| | | | | | | | | | | | | | | | new-style and old-style formatting.
* | | | merge with 3.3Georg Brandl2012-10-281-2/+2
|\ \ \ \ | |/ / /
| * | | merge with 3.2Georg Brandl2012-10-281-2/+2
| |\ \ \ | | |/ /
| | * | changeset: 80007:49e4541f2aefGeorg Brandl2012-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parent: 80003:be83cbf4a789 parent: 80006:32df036e6b75 user: Georg Brandl <georg@python.org> date: Sun Oct 28 10:50:11 2012 +0100 summary: merge with 3.3
* | | | Merge issue #14616: Mention shlex.quote in subprocess docs.Andrew Svetlov2012-10-281-0/+4
|\ \ \ \ | |/ / / | | | | | | | | Patch by Chris Rebert.
| * | | Issue #14616: Mention shlex.quote in subprocess docs.Andrew Svetlov2012-10-281-0/+4
| | | | | | | | | | | | | | | | Patch by Chris Rebert.
* | | | Issue #16340: Merged fix from 3.3.Vinay Sajip2012-10-281-1/+1
|\ \ \ \ | |/ / /
| * | | Issue #16340: exclude venv/scripts from byte-compilation at installation ↵Vinay Sajip2012-10-281-1/+1
| | | | | | | | | | | | | | | | time on Windows.
* | | | Minor typo fix.Georg Brandl2012-10-282-2/+2
| | | |
* | | | merge with 3.3Georg Brandl2012-10-281-0/+5
|\ \ \ \ | |/ / /
| * | | Add a autobuild-quick target that only rebuilds HTML.Georg Brandl2012-10-281-0/+5
| | | |
* | | | merge with 3.3Georg Brandl2012-10-281-8/+10
|\ \ \ \ | |/ / /
| * | | merge with 3.2Georg Brandl2012-10-281-8/+10
| |\ \ \ | | |/ /
| | * | #8040: fix jQuery incompatibilityGeorg Brandl2012-10-281-8/+10
| | | |
* | | | merge #12890: skip tests which fail on windows until fixed or rewritten.R David Murray2012-10-271-2/+2
|\ \ \ \ | |/ / / | | | | | | | | We may rewrite these using mock per issue 15749.
| * | | #12890: skip tests which fail on windows until fixed or rewritten.R David Murray2012-10-271-2/+2
| | | | | | | | | | | | | | | | We may rewrite these using mock per issue 15749.
* | | | merge #15889: make regrtest --start succeed in more cases.R David Murray2012-10-271-2/+2
|\ \ \ \ | |/ / / | | | | | | | | Patch by Chris Jerdonek.
| * | | merge #15889: make regrtest --start succeed in more cases.R David Murray2012-10-271-2/+2
| |\ \ \ | | |/ / | | | | | | | | Patch by Chris Jerdonek.
| | * | #15889: make regrtest --start succeed in more cases.R David Murray2012-10-271-2/+2
| | | | | | | | | | | | | | | | Patch by Chris Jerdonek.
* | | | #16337: merge with 3.3.Ezio Melotti2012-10-271-1/+1
|\ \ \ \ | |/ / /
| * | | #16337: fix typo.Ezio Melotti2012-10-271-1/+1
| | | |
* | | | #8040: merge with 3.3.Ezio Melotti2012-10-271-2/+6
|\ \ \ \ | |/ / /
| * | | #8040: merge with 3.2.Ezio Melotti2012-10-271-2/+6
| |\ \ \ | | |/ /
| | * | #8040: fix the version.Ezio Melotti2012-10-271-2/+6
| | | |
* | | | #8040: merge with 3.3.Ezio Melotti2012-10-271-1/+1
|\ \ \ \ | |/ / /
| * | | #8040: merge with 3.2.Ezio Melotti2012-10-271-1/+1
| |\ \ \ | | |/ /
| | * | #8040: enable the versionswitcher for the autobuild-dev target.Ezio Melotti2012-10-271-1/+1
| | | |
* | | | #8040: merge with 3.3.Ezio Melotti2012-10-273-1/+72
|\ \ \ \ | |/ / /
| * | | #8040: merge with 3.2.Ezio Melotti2012-10-273-1/+72
| |\ \ \ | | |/ /
| | * | #8040: add a version switcher to the documentation. Patch by Yury Selivanov.Ezio Melotti2012-10-273-2/+73
| | | |
* | | | merge #12890: don't emit <p> tags in text mode when logdir specified.R David Murray2012-10-274-11/+37
|\ \ \ \ | |/ / / | | | | | | | | Patch by Jeff McNeil.
| * | | merge #12890: don't emit <p> tags in text mode when logdir specified.R David Murray2012-10-274-11/+37
| |\ \ \ | | |/ / | | | | | | | | Patch by Jeff McNeil.
| | * | #12890: don't emit <p> tags in text mode when logdir specified.R David Murray2012-10-273-3/+12
| | | | | | | | | | | | | | | | Patch by Jeff McNeil.
* | | | merge from 3.3Senthil Kumaran2012-10-271-3/+4
|\ \ \ \ | |/ / /
| * | | merge from 3.2Senthil Kumaran2012-10-271-3/+4
| |\ \ \ | | |/ /
| | * | Automated merge with file:///home/vagrant/3.3Senthil Kumaran2012-10-271-3/+4
| | |\ \
| | | * | Include mention of jenkins as an example framework for doing CISenthil Kumaran2012-10-271-3/+4
| | | | |
* | | | | merge #15043: Improve test_gdb support of gdb >= 7.4.R David Murray2012-10-271-38/+44
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | Instead of requiring the tester to manually add the path to the python-gdb.py file in the checkout to their .gdbinit file, add it automatically when invoking gdb in the test.
| * | | | merge #15043: Improve test_gdb support of gdb >= 7.4.R David Murray2012-10-271-38/+44
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | Instead of requiring the tester to manually add the path to the python-gdb.py file in the checkout to their .gdbinit file, add it automatically when invoking gdb in the test.
| | * | | #15043: Improve test_gdb support of gdb >= 7.4.R David Murray2012-10-271-38/+46
| | |/ / | | | | | | | | | | | | | | | | | | | | Instead of requiring the tester to manually add the path to the python-gdb.py file in the checkout to their .gdbinit file, add it automatically when invoking gdb in the test.
* | | | Merge 3.3Hynek Schlawack2012-10-274-1/+23
|\ \ \ \ | |/ / /
| * | | #16307: Fix multiprocessing.Pool.map_async not calling its callbacksHynek Schlawack2012-10-274-1/+23
| | | | | | | | | | | | | | | | Patch by Janne Karila.
* | | | merge 3.3 and 3.2 changes related to 10836Senthil Kumaran2012-10-270-0/+0
|\ \ \ \ | |/ / /
| * | | Issue #16250: Fix URLError invocation with proper argsSenthil Kumaran2012-10-273-16/+51
| |\ \ \ | | |/ /
| | * | Issue #16250: Fix URLError invocation with proper args.Senthil Kumaran2012-10-273-18/+52
| | | |