Commit graph

57254 commits

Author SHA1 Message Date
Benjamin Peterson
2c05a2e01b do safety checks on __qualname__ assignment 2012-10-31 00:01:15 -04:00
Benjamin Peterson
8afa7fa510 don't shadow the __qualname__ descriptor with __qualname__ in the class's __dict__ (closes #16271) 2012-10-30 23:51:03 -04:00
Benjamin Peterson
e8ea97fffb merge 3.2 (#16369) 2012-10-30 23:27:52 -04:00
Benjamin Peterson
c43112823b initialize more global type objects (closes #16369) 2012-10-30 23:21:10 -04:00
R David Murray
cc4bacf207 #12890: fix test on windows
Patch by Stephen Tonkin.
2012-10-30 20:20:09 -04: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
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
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
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
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
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
Vinay Sajip
484adb509e Merged upstream changes. 2012-10-28 12:41:44 +00:00
Vinay Sajip
bdd13fd098 Closes #16340: Handle exception while copying script to venv. 2012-10-28 12:39:39 +00: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
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
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
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
c2415eb7e6 Issue #14616: Mention shlex.quote in subprocess docs.
Patch by Chris Rebert.
2012-10-28 11:42:26 +02: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
01f47e82a3 Add a autobuild-quick target that only rebuilds HTML. 2012-10-28 08:09:02 +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
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
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
971ba4c817 #16337: fix typo. 2012-10-27 23:25:18 +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
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
Ezio Melotti
8630c1e346 #8040: merge with 3.2. 2012-10-27 22:11:33 +03:00
Ezio Melotti
380ce651e9 #8040: add a version switcher to the documentation. Patch by Yury Selivanov. 2012-10-27 22:09:16 +03:00
R David Murray
c4b8e05092 merge #12890: don't emit <p> tags in text mode when logdir specified.
Patch by Jeff McNeil.
2012-10-27 14:55:25 -04:00
R David Murray
252cd0e4e0 #12890: don't emit <p> tags in text mode when logdir specified.
Patch by Jeff McNeil.
2012-10-27 14:42:47 -04:00
Senthil Kumaran
0b3014dda0 merge from 3.2 2012-10-27 11:05:32 -07:00
Senthil Kumaran
bc876a2d4a Automated merge with file:///home/vagrant/3.3 2012-10-27 11:05:02 -07:00
Senthil Kumaran
847c33cc3b Include mention of jenkins as an example framework for doing CI 2012-10-27 11:04:55 -07:00
R David Murray
f358eaf362 merge #15043: Improve test_gdb support of gdb >= 7.4.
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.
2012-10-27 13:26:14 -04:00