summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
* | | merge with 3.3Philip Jenvey2012-10-272-3/+6
|\ \ \ | |/ /
| * | merge with 3.2Philip Jenvey2012-10-272-3/+6
| |\ \ | | |/
| | * bounds check for bad data (thanks amaury)Philip Jenvey2012-10-272-3/+6
| | |
* | | Merge issue #16243: add example for inspect.formatargspecAndrew Svetlov2012-10-261-2/+9
|\ \ \ | |/ / | | | | | | Patch by Berker Peksag.
| * | Issue #16243: add example for inspect.formatargspecAndrew Svetlov2012-10-261-2/+9
| | | | | | | | | | | | Patch by Berker Peksag.
* | | Merge 3.3Petri Lehtinen2012-10-261-0/+1
|\ \ \ | |/ /
| * | Add Modules/_freeze_importlib to .gitignorePetri Lehtinen2012-10-261-0/+1
| | |
* | | Merge heads.Ezio Melotti2012-10-261-1/+1
|\ \ \
| * \ \ #16317: merge with 3.3.Ezio Melotti2012-10-261-1/+1
| |\ \ \ | | |/ /
| | * | #16317: mention lzma in the tutorial. Patch by Serhiy Storchaka.Ezio Melotti2012-10-261-1/+1
| | | |
* | | | remove obsolete hasattr() check for socket.sendallGiampaolo Rodola'2012-10-261-9/+1
|/ / /
* | | #16206: merge with 3.3.Ezio Melotti2012-10-261-6/+6
|\ \ \ | |/ /
| * | #16206: merge with 3.2.Ezio Melotti2012-10-261-6/+6
| |\ \ | | |/
| | * #16206: Improve examples about dict construction.Ezio Melotti2012-10-261-6/+6
| | |
* | | Merge from 3.3: fix formatting of syntax description of function definition.Chris Jerdonek2012-10-261-2/+1
|\ \ \ | |/ /
| * | Merge from 3.2: fix formatting of syntax description of function definition.Chris Jerdonek2012-10-261-2/+1
| |\ \ | | |/