Commit graph

9705 commits

Author SHA1 Message Date
Ezio Melotti
982ef4e0bc #11845: Fix typo in rangeobject.c that caused a crash in compute_slice_indices. Patch by Daniel Urban. 2011-04-15 08:15:40 +03:00
Senthil Kumaran
99e97f92c6 merge from 3.2.
Fix closes Issue1147.
2011-04-14 13:20:41 +08:00
Senthil Kumaran
56f1e2d875 merge from 3.1 2011-04-14 13:18:55 +08:00
Senthil Kumaran
2d2ea1b431 Fix Issue11474 - fix url2pathname() handling of '/C|/' on Windows 2011-04-14 13:16:30 +08:00
R David Murray
b35c850a3f #11684: Complete parser bytes interface by adding BytesHeaderParser
Patch by Steffen Daode Nurpmeso.
2011-04-13 16:46:05 -04:00
Raymond Hettinger
f400ab40e4 merge 2011-04-13 11:50:34 -07:00
Raymond Hettinger
8a9c4d9866 Issue 3051: make pure python code pass the same tests as the C version. 2011-04-13 11:49:57 -07:00
Ezio Melotti
7d01e78c9e Merge with 3.2. 2011-04-13 07:21:24 +03:00
Ezio Melotti
04c6423fba Merge with 3.1. 2011-04-13 07:18:24 +03:00
R David Murray
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
R David Murray
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
Benjamin Peterson
59c90c6cb2 merge 3.2 2011-04-12 18:35:21 -05:00
Benjamin Peterson
62f8bcb0a4 merge 3.1 2011-04-12 18:34:30 -05:00
Benjamin Peterson
abdeeff3d1 merge heads 2011-04-12 18:34:06 -05:00
Benjamin Peterson
bd3e362089 make assigning to a bytes literal a syntax error (closes #11506) 2011-04-12 18:33:28 -05:00
Senthil Kumaran
5809403e6d merge the change update. 2011-04-13 07:25:48 +08:00
Senthil Kumaran
1cea9a0227 merge from 3.2 2011-04-13 07:24:32 +08:00
Senthil Kumaran
b17abb1af9 merge from 3.1 2011-04-13 07:22:29 +08:00
Victor Stinner
9bf133ca31 Fix #11825: disable regrtest timeout if Python doesn't support threads 2011-04-13 01:06:27 +02:00
Senthil Kumaran
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
Raymond Hettinger
9180deb59c Issue 11747: Fix output format for context diffs. 2011-04-12 15:25:30 -07:00
Raymond Hettinger
f03d3028e0 Issue 11747: Fix output format for context diffs. 2011-04-12 15:19:33 -07:00
Raymond Hettinger
3780542039 Issue 11747: Fix output format for context diffs. 2011-04-12 15:14:12 -07:00
Nadeem Vawda
ea4b46f9a9 Fix 64-bit safety issue in BZ2Compressor and BZ2Decompressor. 2011-04-12 23:02:42 +02:00
Raymond Hettinger
2498c9f06e Issue #11747: Fix range formatting in context and unified diffs. 2011-04-11 12:42:59 -07:00
Raymond Hettinger
49353d0e8f Issue #11747: Fix range formatting in context and unified diffs. 2011-04-11 12:40:58 -07:00
Vinay Sajip
4a0a31df5c Added 'handlers' argument to logging.basicConfig. 2011-04-11 08:42:07 +01:00
R David Murray
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
Ezio Melotti
88fdeb45ef #2650: re.escape() no longer escapes the "_". 2011-04-10 12:59:16 +03:00
Ned Deily
4e6aba6f63 Issue9670: Merge backout from 3.2. 2011-04-09 14:58:04 -07:00
Ned Deily
2604e33f30 Issue9670: Merge backout to 3.2. 2011-04-09 14:53:47 -07:00
Ned Deily
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
Antoine Pitrou
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
Ned Deily
6e678b4395 Issue #9670: merge with current 2011-04-09 12:47:12 -07:00
Ned Deily
15012a67d2 Issue #9670: merge with 3.2 2011-04-09 12:37:55 -07:00
Ned Deily
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
Ross Lagerwall
b2a290c329 Merge with 3.2 2011-04-09 20:12:43 +02:00
Ross Lagerwall
226580e6dc Merge with 3.1 2011-04-09 20:05:04 +02:00
Ross Lagerwall
e620d10701 Issue #11719: Fix message about unexpected test_msilib skip.
Patch by Nadeem Vawda.
2011-04-09 19:30:03 +02:00
Victor Stinner
c790a5346d faulthandler: dump_tracebacks_later() displays also the timeout 2011-04-08 13:39:59 +02:00
Victor Stinner
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
R David Murray
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
R David Murray
63d320b44f Merge: Improve test coverage of _split_ascii method. 2011-04-07 20:42:28 -04:00
Brian Quinlan
d08b330a15 Merge to tip. 2011-04-08 08:30:41 +10:00
Brian Quinlan
f007876bd6 Issue #11777: Executor.map does not submit futures until iter.next() is called 2011-04-08 08:19:33 +10:00
Antoine Pitrou
b1eb660270 Fix faulthandler timeout to avoid breaking buildbots 2011-04-07 23:22:28 +02:00
Ezio Melotti
6537be7fb2 #7311: merge with 3.2. 2011-04-07 22:27:44 +03:00
Ezio Melotti
2e3607c1e7 #7311: fix html.parser to accept non-ASCII attribute values. 2011-04-07 22:03:31 +03:00
Victor Stinner
ff4cd88266 faulthandler: fix compilating without threads 2011-04-07 11:50:25 +02:00
Antoine Pitrou
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