Commit graph

57637 commits

Author SHA1 Message Date
Brian Curtin
a5e7cd06bb Merge 3.3 2012-10-29 18:20:18 -05:00
Brian Curtin
6b879fa402 Merge 3.2 2012-10-29 18:18:43 -05:00
Brian Curtin
e9aeca7c24 Fix #16197. Update docstrings and documentation to match winreg code.
Patch by Zachary Ware.
2012-10-29 18:16:39 -05:00
Petri Lehtinen
f1380557e3 #14897: Enhance error messages of struct.pack and struct.pack_into
Patch by Matti Mäki.
2012-10-29 21:26:56 +02:00
Petri Lehtinen
4648b4779a #14897: Enhance error messages of struct.pack and struct.pack_into
Patch by Matti Mäki.
2012-10-29 21:25:01 +02:00
Petri Lehtinen
92c28cace4 #14897: Enhance error messages of struct.pack and struct.pack_into
Patch by Matti Mäki.
2012-10-29 21:24:07 +02:00
Ross Lagerwall
2bb842a2ef Merge with 3.3 for issue #16262 2012-10-29 17:39:19 +00:00
Ross Lagerwall
646eb1e856 Merge with 3.2 for issue #16262 2012-10-29 17:35:57 +00:00
Ross Lagerwall
1b863ebfc8 Fix regression from issue #16262 2012-10-29 17:31:54 +00:00
Chris Jerdonek
21fecc764c Merge from 3.3: remove unneeded "Release" and "Date" markers from index pages. 2012-10-28 11:13:51 -07:00
Chris Jerdonek
d285029ee8 Merge from 3.2: remove unneeded "Release" and "Date" markers from index pages. 2012-10-28 11:10:24 -07:00
Chris Jerdonek
8b7f9f581d Remove unneeded "Release" and "Date" markers from doc index pages. 2012-10-28 11:08:26 -07:00
Brett Cannon
6c1da829ba merge 2012-10-28 11:49:00 -04:00
Brett Cannon
0e8c49d358 merge 2012-10-28 11:48:24 -04:00
Brett Cannon
6a85f3cbe4 Merge with 3.3 2012-10-28 11:47:54 -04:00
Brett Cannon
f873d7c20e Issue #16342: Lib/_sysconfigdata.py is no longer put into Lib, so
don't ignore it if it's still there.
2012-10-28 11:46:51 -04:00
Nadeem Vawda
8ca705d549 Merge: Add test for BZ2Decompressor.decompress("") after end of stream. 2012-10-28 15:22:08 +01:00
Nadeem Vawda
6294305c2f Merge: Add test for BZ2Decompressor.decompress("") after end of stream. 2012-10-28 15:21:37 +01:00
Nadeem Vawda
a1952d4120 Add test for BZ2Decompressor.decompress("") after end of stream. 2012-10-28 15:20:48 +01:00
Nadeem Vawda
84833aa7b4 Issue #16316: mimetypes now recognizes the .xz and .txz (.tar.xz) extensions.
Patch by Serhiy Storchaka.
2012-10-28 14:52:34 +01:00
Hynek Schlawack
27ddb576f1 #1492704: Ensure and document backward compatibility of the change 2012-10-28 13:59:27 +01:00
Vinay Sajip
5887959091 Null merge. 2012-10-28 12:42:25 +00:00
Vinay Sajip
484adb509e Merged upstream changes. 2012-10-28 12:41:44 +00:00
Vinay Sajip
13e7837489 Merged upstream changes. 2012-10-28 12:41:21 +00:00
Vinay Sajip
526417fc59 Closes #16340: Merged fix from 3.3. 2012-10-28 12:40:20 +00:00
Vinay Sajip
bdd13fd098 Closes #16340: Handle exception while copying script to venv. 2012-10-28 12:39:39 +00:00
Georg Brandl
3b80d34c55 Remove confusing "Release" and "Date" markers from whatsnews. Merge with 3.3. 2012-10-28 13:37:54 +01:00
Georg Brandl
ff65a10418 Remove confusing "Release" and "Date" markers from whatsnews. Merge with 3.2. 2012-10-28 13:37:18 +01:00
Georg Brandl
6a935d9230 merge heads 2012-10-28 13:37:05 +01:00
Georg Brandl
75f0020d29 Remove confusing "Release" and "Date" markers from whatsnews. 2012-10-28 13:35:56 +01:00
Andrew Svetlov
21b102481b merge heads 2012-10-28 14:12:50 +02:00
Andrew Svetlov
42b8932c12 Merge issue #14570: Document json sort_keys parameter properly.
Patch by Chris Rebert.
2012-10-28 14:11:21 +02:00
Andrew Svetlov
6d50a5447a Merge issue #14570: Document json sort_keys parameter properly.
Patch by Chris Rebert.
2012-10-28 14:11:00 +02:00
Andrew Svetlov
2ec53be2e2 Issue #14570: Document json sort_keys parameter properly.
Patch by Chris Rebert.
2012-10-28 14:10:30 +02:00
Mark Dickinson
61254b9391 Issue #14700: merge tests from 3.3. 2012-10-28 10:23:08 +00:00
Mark Dickinson
2a83f16e5e Issue #14700: merge tests from 3.2. 2012-10-28 10:22:22 +00:00
Mark Dickinson
fb90c0934c Issue #14700: Fix buggy overflow checks for large precision and width in new-style and old-style formatting. 2012-10-28 10:18:03 +00:00
Georg Brandl
7fe16b36ab merge with 3.3 2012-10-28 10:51:52 +01:00
Georg Brandl
5b9561d1f1 merge with 3.2 2012-10-28 10:51:46 +01:00
Georg Brandl
579d5cd643 changeset: 80007:49e4541f2aef
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
2012-10-28 10:51:35 +01:00
Andrew Svetlov
87c315eb75 Merge issue #14616: Mention shlex.quote in subprocess docs.
Patch by Chris Rebert.
2012-10-28 11:43:02 +02:00
Andrew Svetlov
c2415eb7e6 Issue #14616: Mention shlex.quote in subprocess docs.
Patch by Chris Rebert.
2012-10-28 11:42:26 +02:00
Vinay Sajip
d94a502cb0 Issue #16340: Merged fix from 3.3. 2012-10-28 09:11:48 +00:00
Vinay Sajip
65e2bef4f0 Issue #16340: exclude venv/scripts from byte-compilation at installation time on Windows. 2012-10-28 09:11:00 +00:00
Georg Brandl
3962d5e892 Minor typo fix. 2012-10-28 08:48:28 +01:00
Georg Brandl
534ca2b8ea merge with 3.3 2012-10-28 08:09:31 +01:00
Georg Brandl
01f47e82a3 Add a autobuild-quick target that only rebuilds HTML. 2012-10-28 08:09:02 +01:00
Georg Brandl
9e80124ca2 merge with 3.3 2012-10-28 08:00:01 +01:00
Georg Brandl
ab5da6a80e merge with 3.2 2012-10-28 07:59:54 +01:00
Georg Brandl
fffc25da83 #8040: fix jQuery incompatibility 2012-10-28 07:59:42 +01:00