f400ab40e4
merge
2011-04-13 11:50:34 -07:00
8a9c4d9866
Issue 3051: make pure python code pass the same tests as the C version.
2011-04-13 11:49:57 -07:00
7d01e78c9e
Merge with 3.2.
2011-04-13 07:21:24 +03:00
04c6423fba
Merge with 3.1.
2011-04-13 07:18:24 +03:00
d16ee63df2
Merge #10019 : Fix regression relative to 2.6: add newlines if indent=0
...
Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
2011-04-12 21:19:20 -04:00
d5315482e9
Merge #10019 : Fix regression relative to 2.6: add newlines if indent=0
...
Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
2011-04-12 21:09:18 -04:00
59c90c6cb2
merge 3.2
2011-04-12 18:35:21 -05:00
62f8bcb0a4
merge 3.1
2011-04-12 18:34:30 -05:00
abdeeff3d1
merge heads
2011-04-12 18:34:06 -05:00
bd3e362089
make assigning to a bytes literal a syntax error ( closes #11506 )
2011-04-12 18:33:28 -05:00
5809403e6d
merge the change update.
2011-04-13 07:25:48 +08:00
1cea9a0227
merge from 3.2
2011-04-13 07:24:32 +08:00
b17abb1af9
merge from 3.1
2011-04-13 07:22:29 +08:00
9bf133ca31
Fix #11825 : disable regrtest timeout if Python doesn't support threads
2011-04-13 01:06:27 +02:00
2643041970
Fix Issue11703 - urllib2.geturl() does not return correct url when the original url contains #fragment. Patch Contribution by Santoso Wijaya.
2011-04-13 07:01:19 +08:00
9180deb59c
Issue 11747: Fix output format for context diffs.
2011-04-12 15:25:30 -07:00
f03d3028e0
Issue 11747: Fix output format for context diffs.
2011-04-12 15:19:33 -07:00
3780542039
Issue 11747: Fix output format for context diffs.
2011-04-12 15:14:12 -07:00
ea4b46f9a9
Fix 64-bit safety issue in BZ2Compressor and BZ2Decompressor.
2011-04-12 23:02:42 +02:00
2498c9f06e
Issue #11747 : Fix range formatting in context and unified diffs.
2011-04-11 12:42:59 -07:00
49353d0e8f
Issue #11747 : Fix range formatting in context and unified diffs.
2011-04-11 12:40:58 -07:00
4a0a31df5c
Added 'handlers' argument to logging.basicConfig.
2011-04-11 08:42:07 +01:00
eb9e074dca
Use stock assertEqual instead of custom ndiffAssertEqual.
...
Eventually I'll actually replace the calls in the tests themselves.
2011-04-10 15:28:29 -04:00
88fdeb45ef
#2650 : re.escape() no longer escapes the "_".
2011-04-10 12:59:16 +03:00
4e6aba6f63
Issue9670: Merge backout from 3.2.
2011-04-09 14:58:04 -07:00
2604e33f30
Issue9670: Merge backout to 3.2.
2011-04-09 14:53:47 -07:00
45e47e58ed
Issue9670: Back out changeset 378b40d71175; test fails on other platforms
...
and on OS X with pydebug.
2011-04-09 14:50:59 -07:00
131a6414dd
Issue #11757 : select.select() now raises ValueError when a negative timeout
...
is passed (previously, a select.error with EINVAL would be raised). Patch
by Charles-François Natali.
2011-04-09 23:49:58 +02:00
6e678b4395
Issue #9670 : merge with current
2011-04-09 12:47:12 -07:00
15012a67d2
Issue #9670 : merge with 3.2
2011-04-09 12:37:55 -07:00
517ac72b00
Issue #9670 : Increase the default stack size for secondary threads on
...
Mac OS X and FreeBSD to reduce the chances of a crash instead of a
"maximum recursion depth" RuntimeError exception.
(Patch by Ronald Oussoren)
2011-04-09 12:32:12 -07:00
b2a290c329
Merge with 3.2
2011-04-09 20:12:43 +02:00
226580e6dc
Merge with 3.1
2011-04-09 20:05:04 +02:00
e620d10701
Issue #11719 : Fix message about unexpected test_msilib skip.
...
Patch by Nadeem Vawda.
2011-04-09 19:30:03 +02:00
c790a5346d
faulthandler: dump_tracebacks_later() displays also the timeout
2011-04-08 13:39:59 +02:00
de10f4054b
faulthandler: one more time, fix usage of locks in the watchdog thread
...
* Write a new test to ensure that dump_tracebacks_later() still works if
it was already called and then cancelled before
* Don't use a variable to check the status of the thread, only rely on locks
* The thread only releases cancel_event if it was able to acquire it (if
the timer was interrupted)
* The main thread always hold this lock. It is only released when
faulthandler_thread() is interrupted until this thread exits, or at Python
exit.
2011-04-08 12:57:06 +02:00
7ede59d77a
Merge #11492 : fix header truncation on folding when there are runs of split chars.
...
Not a complete fix for this issue.
2011-04-07 21:00:33 -04:00
63d320b44f
Merge: Improve test coverage of _split_ascii method.
2011-04-07 20:42:28 -04:00
d08b330a15
Merge to tip.
2011-04-08 08:30:41 +10:00
f007876bd6
Issue #11777 : Executor.map does not submit futures until iter.next() is called
2011-04-08 08:19:33 +10:00
b1eb660270
Fix faulthandler timeout to avoid breaking buildbots
2011-04-07 23:22:28 +02:00
6537be7fb2
#7311 : merge with 3.2.
2011-04-07 22:27:44 +03:00
2e3607c1e7
#7311 : fix html.parser to accept non-ASCII attribute values.
2011-04-07 22:03:31 +03:00
ff4cd88266
faulthandler: fix compilating without threads
2011-04-07 11:50:25 +02:00
efbcb18997
Issue #11766 : increase countdown waiting for a pool of processes to start
...
up. Hopefully fixes transient buildbot failures.
2011-04-06 22:54:14 +02:00
540ab064e2
Issue #11766 : increase countdown waiting for a pool of processes to start
...
up. Hopefully fixes transient buildbot failures.
2011-04-06 22:51:17 +02:00
8debacb51c
#1690608 : make formataddr RFC2047 aware.
...
Patch by Torsten Becker.
2011-04-06 09:35:57 -04:00
a0b1c77a19
Merge #11605 : don't use set/get_payload in feedparser; they do conversions.
2011-04-06 08:16:13 -04:00
736975a771
merge from 3.2
2011-04-06 14:16:08 +08:00
ae664fb528
Merge from 3.1
2011-04-06 14:11:09 +08:00
Raymond Hettinger
Ezio Melotti
R David Murray
Benjamin Peterson
Senthil Kumaran
Victor Stinner
Nadeem Vawda
Vinay Sajip
Ned Deily
Antoine Pitrou
Ross Lagerwall
Brian Quinlan
Ezio Melotti