Commit Graph

58109 Commits

Author SHA1 Message Date
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
Ezio Melotti 1543b8c77e #8040: merge with 3.3. 2012-10-27 22:11:57 +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 dcd34a6419 merge #12890: don't emit <p> tags in text mode when logdir specified.
Patch by Jeff McNeil.
2012-10-27 14:57:22 -04: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 450371305f merge from 3.3 2012-10-27 11:05:54 -07: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 9617ce99a9 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:36:59 -04: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
R David Murray f9333026f7 #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:22:41 -04:00
Hynek Schlawack 969684f2ad Merge 3.3 2012-10-27 12:56:30 +02:00
Hynek Schlawack 254af2644a #16307: Fix multiprocessing.Pool.map_async not calling its callbacks
Patch by Janne Karila.
2012-10-27 12:53:02 +02:00