summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 3.3Brian Curtin2012-10-293-92/+122
|\
| * Merge 3.2Brian Curtin2012-10-293-92/+122
| |\
| | * Fix #16197. Update docstrings and documentation to match winreg code.Brian Curtin2012-10-293-92/+122
| | | | | | | | | | | | Patch by Zachary Ware.
* | | #14897: Enhance error messages of struct.pack and struct.pack_intoPetri Lehtinen2012-10-293-4/+18
|\ \ \ | |/ / | | | | | | Patch by Matti Mäki.
| * | #14897: Enhance error messages of struct.pack and struct.pack_intoPetri Lehtinen2012-10-293-4/+18
| |\ \ | | |/ | | | | | | Patch by Matti Mäki.
| | * #14897: Enhance error messages of struct.pack and struct.pack_intoPetri Lehtinen2012-10-293-5/+19
| | | | | | | | | | | | Patch by Matti Mäki.
* | | Merge with 3.3 for issue #16262Ross Lagerwall2012-10-292-134/+149
|\ \ \ | |/ /
| * | Merge with 3.2 for issue #16262Ross Lagerwall2012-10-292-134/+149
| |\ \ | | |/
| | * Fix regression from issue #16262Ross Lagerwall2012-10-292-127/+142
| | |
* | | Merge from 3.3: remove unneeded "Release" and "Date" markers from index pages.Chris Jerdonek2012-10-288-22/+0
|\ \ \ | |/ /
| * | Merge from 3.2: remove unneeded "Release" and "Date" markers from index pages.Chris Jerdonek2012-10-288-22/+0
| |\ \ | | |/
| | * Remove unneeded "Release" and "Date" markers from doc index pages.Chris Jerdonek2012-10-288-22/+0
| | |
| * | mergeBrett Cannon2012-10-2816-37/+84
| |\ \
* | \ \ mergeBrett Cannon2012-10-2823-42/+99
|\ \ \ \
| * \ \ \ Merge: Add test for BZ2Decompressor.decompress("") after end of stream.Nadeem Vawda2012-10-281-0/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge: Add test for BZ2Decompressor.decompress("") after end of stream.Nadeem Vawda2012-10-281-0/+1
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Add test for BZ2Decompressor.decompress("") after end of stream.Nadeem Vawda2012-10-281-0/+1
| | | | |
| * | | | Issue #16316: mimetypes now recognizes the .xz and .txz (.tar.xz) extensions.Nadeem Vawda2012-10-283-0/+7
| | | | | | | | | | | | | | | | | | | | Patch by Serhiy Storchaka.
| * | | | #1492704: Ensure and document backward compatibility of the changeHynek Schlawack2012-10-282-1/+4
| | | | |
| * | | | Null merge.Vinay Sajip2012-10-280-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Merged upstream changes.Vinay Sajip2012-10-286-13/+0
| | |\ \ \
| * | \ \ \ Merged upstream changes.Vinay Sajip2012-10-287-15/+2
| |\ \ \ \ \
| | * \ \ \ \ Remove confusing "Release" and "Date" markers from whatsnews. Merge with 3.3.Georg Brandl2012-10-287-15/+2
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Remove confusing "Release" and "Date" markers from whatsnews. Merge with 3.2.Georg Brandl2012-10-286-13/+0
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | merge headsGeorg Brandl2012-10-285-10/+0
| | | | |\ \ \
| | | | | * | | Remove confusing "Release" and "Date" markers from whatsnews.Georg Brandl2012-10-285-10/+0
| | | | | | | |
| | | | * | | | merge headsAndrew Svetlov2012-10-282-8/+23
| | | | |\ \ \ \
| * | | | \ \ \ \ Closes #16340: Merged fix from 3.3.Vinay Sajip2012-10-281-5/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | / / | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Closes #16340: Handle exception while copying script to venv.Vinay Sajip2012-10-281-5/+11
| | |/ / / / /
| * | | | | | 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 with 3.3Brett Cannon2012-10-281-1/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Issue #16342: Lib/_sysconfigdata.py is no longer put into Lib, soBrett Cannon2012-10-281-1/+0
| |/ / / | | | | | | | | | | | | don't ignore it if it's still there.