mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13
57624 commits 7 branches 625 tags 3.9 GiB
Commit graph

57624 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
R David Murray
7c38ec2de0 merge #12890: skip tests which fail on windows until fixed or rewritten. 
We may rewrite these using mock per issue 15749.
 2012-10-27 17:39:57 -04:00
R David Murray
74076cb85e #12890: skip tests which fail on windows until fixed or rewritten. 
We may rewrite these using mock per issue 15749.
 2012-10-27 17:39:25 -04:00
R David Murray
7041b995cd merge #15889: make regrtest --start succeed in more cases. 
Patch by Chris Jerdonek.
 2012-10-27 17:09:37 -04:00
R David Murray
4d9f31846a merge #15889: make regrtest --start succeed in more cases. 
Patch by Chris Jerdonek.
 2012-10-27 17:08:37 -04:00
R David Murray
c3bf78a212 #15889: make regrtest --start succeed in more cases. 
Patch by Chris Jerdonek.
 2012-10-27 17:07:05 -04:00
Ezio Melotti
acf1754bf3 #16337: merge with 3.3. 2012-10-27 23:25:38 +03:00
Ezio Melotti
971ba4c817 #16337: fix typo. 2012-10-27 23:25:18 +03:00
Ezio Melotti
0f3dae41ef #8040: merge with 3.3. 2012-10-27 23:13:34 +03:00
Ezio Melotti
edde409f60 #8040: merge with 3.2. 2012-10-27 23:13:22 +03:00
Ezio Melotti
e5b1023ae2 #8040: fix the version. 2012-10-27 23:12:48 +03:00
Ezio Melotti
9375ff1c5c #8040: merge with 3.3. 2012-10-27 22:30:04 +03:00
Ezio Melotti
fe71bb52e4 #8040: merge with 3.2. 2012-10-27 22:29:50 +03:00
Ezio Melotti
58864b3cad #8040: enable the versionswitcher for the autobuild-dev target. 2012-10-27 22:28:48 +03:00