Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge | Brett Cannon | 2012-10-28 | 23 | -42/+99 |
|\ | |||||
| * | Merge: Add test for BZ2Decompressor.decompress("") after end of stream. | Nadeem Vawda | 2012-10-28 | 1 | -0/+1 |
| |\ | |||||
| | * | Merge: Add test for BZ2Decompressor.decompress("") after end of stream. | Nadeem Vawda | 2012-10-28 | 1 | -0/+1 |
| | |\ | |||||
| | | * | Add test for BZ2Decompressor.decompress("") after end of stream. | Nadeem Vawda | 2012-10-28 | 1 | -0/+1 |
| | | | | |||||
| * | | | Issue #16316: mimetypes now recognizes the .xz and .txz (.tar.xz) extensions. | Nadeem Vawda | 2012-10-28 | 3 | -0/+7 |
| | | | | | | | | | | | | | | | | Patch by Serhiy Storchaka. | ||||
| * | | | #1492704: Ensure and document backward compatibility of the change | Hynek Schlawack | 2012-10-28 | 2 | -1/+4 |
| | | | | |||||
| * | | | Null merge. | Vinay Sajip | 2012-10-28 | 0 | -0/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | Merged upstream changes. | Vinay Sajip | 2012-10-28 | 6 | -13/+0 |
| | |\ \ | |||||
| * | \ \ | Merged upstream changes. | Vinay Sajip | 2012-10-28 | 7 | -15/+2 |
| |\ \ \ \ | |||||
| | * \ \ \ | Remove confusing "Release" and "Date" markers from whatsnews. Merge with 3.3. | Georg Brandl | 2012-10-28 | 7 | -15/+2 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Remove confusing "Release" and "Date" markers from whatsnews. Merge with 3.2. | Georg Brandl | 2012-10-28 | 6 | -13/+0 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | merge heads | Georg Brandl | 2012-10-28 | 5 | -10/+0 |
| | | | |\ \ | |||||
| | | | | * | | Remove confusing "Release" and "Date" markers from whatsnews. | Georg Brandl | 2012-10-28 | 5 | -10/+0 |
| | | | | | | | |||||
| | | | * | | | merge heads | Andrew Svetlov | 2012-10-28 | 2 | -8/+23 |
| | | | |\ \ \ | |||||
| * | | | \ \ \ | Closes #16340: Merged fix from 3.3. | Vinay Sajip | 2012-10-28 | 1 | -5/+11 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Closes #16340: Handle exception while copying script to venv. | Vinay Sajip | 2012-10-28 | 1 | -5/+11 |
| | |/ / / / | |||||
| * | | | | | Merge issue #14570: Document json sort_keys parameter properly. | Andrew Svetlov | 2012-10-28 | 2 | -8/+23 |
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | Patch by Chris Rebert. | ||||
| | * | | | | Merge issue #14570: Document json sort_keys parameter properly. | Andrew Svetlov | 2012-10-28 | 2 | -8/+23 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | Patch by Chris Rebert. | ||||
| | | * | | | Issue #14570: Document json sort_keys parameter properly. | Andrew Svetlov | 2012-10-28 | 2 | -8/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | Patch by Chris Rebert. | ||||
| * | | | | | Issue #14700: merge tests from 3.3. | Mark Dickinson | 2012-10-28 | 1 | -0/+27 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Issue #14700: merge tests from 3.2. | Mark Dickinson | 2012-10-28 | 1 | -0/+27 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Issue #14700: Fix buggy overflow checks for large precision and width in ↵ | Mark Dickinson | 2012-10-28 | 5 | -20/+45 |
| | | | |/ | | | |/| | | | | | | | | | | | new-style and old-style formatting. | ||||
| * | | | | merge with 3.3 | Georg Brandl | 2012-10-28 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | merge with 3.2 | Georg Brandl | 2012-10-28 | 1 | -2/+2 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | changeset: 80007:49e4541f2aef | Georg Brandl | 2012-10-28 | 1 | -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 Svetlov | 2012-10-28 | 1 | -0/+4 |
| |\ \ \ \ | | |/ / / | | | | | | | | | | | Patch by Chris Rebert. | ||||
| | * | | | Issue #14616: Mention shlex.quote in subprocess docs. | Andrew Svetlov | 2012-10-28 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | Patch by Chris Rebert. | ||||
| * | | | | Issue #16340: Merged fix from 3.3. | Vinay Sajip | 2012-10-28 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Issue #16340: exclude venv/scripts from byte-compilation at installation ↵ | Vinay Sajip | 2012-10-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | time on Windows. | ||||
| * | | | | Minor typo fix. | Georg Brandl | 2012-10-28 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | merge with 3.3 | Georg Brandl | 2012-10-28 | 1 | -0/+5 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Add a autobuild-quick target that only rebuilds HTML. | Georg Brandl | 2012-10-28 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | merge with 3.3 | Georg Brandl | 2012-10-28 | 1 | -8/+10 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | merge with 3.2 | Georg Brandl | 2012-10-28 | 1 | -8/+10 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | #8040: fix jQuery incompatibility | Georg Brandl | 2012-10-28 | 1 | -8/+10 |
| | | | | | |||||
* | | | | | Merge with 3.3 | Brett Cannon | 2012-10-28 | 1 | -1/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Issue #16342: Lib/_sysconfigdata.py is no longer put into Lib, so | Brett Cannon | 2012-10-28 | 1 | -1/+0 |
| |/ / / | | | | | | | | | | | | | don't ignore it if it's still there. | ||||
* | | | | merge #12890: skip tests which fail on windows until fixed or rewritten. | R David Murray | 2012-10-27 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | | | | | | | | | We may rewrite these using mock per issue 15749. | ||||
| * | | | #12890: skip tests which fail on windows until fixed or rewritten. | R David Murray | 2012-10-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | We may rewrite these using mock per issue 15749. | ||||
* | | | | merge #15889: make regrtest --start succeed in more cases. | R David Murray | 2012-10-27 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | | | | | | | | | Patch by Chris Jerdonek. | ||||
| * | | | merge #15889: make regrtest --start succeed in more cases. | R David Murray | 2012-10-27 | 1 | -2/+2 |
| |\ \ \ | | |/ / | | | | | | | | | Patch by Chris Jerdonek. | ||||
| | * | | #15889: make regrtest --start succeed in more cases. | R David Murray | 2012-10-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Patch by Chris Jerdonek. | ||||
* | | | | #16337: merge with 3.3. | Ezio Melotti | 2012-10-27 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | #16337: fix typo. | Ezio Melotti | 2012-10-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | #8040: merge with 3.3. | Ezio Melotti | 2012-10-27 | 1 | -2/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | #8040: merge with 3.2. | Ezio Melotti | 2012-10-27 | 1 | -2/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | #8040: fix the version. | Ezio Melotti | 2012-10-27 | 1 | -2/+6 |
| | | | | |||||
* | | | | #8040: merge with 3.3. | Ezio Melotti | 2012-10-27 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | #8040: merge with 3.2. | Ezio Melotti | 2012-10-27 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | #8040: enable the versionswitcher for the autobuild-dev target. | Ezio Melotti | 2012-10-27 | 1 | -1/+1 |
| | | | |