Antoine Pitrou
a4eb194ea6
Merge from 3.2
2011-04-16 18:55:16 +02:00
Antoine Pitrou
ee4293400c
Fix possible "file already exists" error when running the tests in parallel.
...
This is a perfect example of LBYL going wrong: that code could be executed
by several workers in parallel, and os.mkdir() attempted on the same
path by multiple processes.
2011-04-16 18:53:59 +02:00
R David Murray
e2c4cfce54
Merge: Improve message.py test coverage to 100%.
...
coverage.py reports 99% on branch coverage, but that appears to be
a bug or limitation in coverage.py.
2011-04-16 09:21:49 -04:00
Vinay Sajip
cd5a2bd48e
Issue #11852 : Merge fix from 3.2.
2011-04-15 22:29:15 +01:00
Vinay Sajip
e723e96103
Issue #11852 : Add missing imports and update tests.
2011-04-15 22:27:17 +01:00
Raymond Hettinger
b5a40d4d3f
Fix minor subclassing issue with collections.Counter
2011-04-15 13:23:01 -07:00
Raymond Hettinger
6c9e5b779f
Fix minor subclassing issue with collections.Counter
2011-04-15 13:21:30 -07:00
Raymond Hettinger
1c746c28f3
Fix minor subclassing issue with collections.Counter
2011-04-15 13:16:46 -07:00
Ezio Melotti
e1adeeb7fd
#5057 : Merge with 3.2.
2011-04-15 16:52:35 +03:00
Ezio Melotti
71e84a6e27
#5057 : Merge with 3.1.
2011-04-15 16:50:41 +03:00
Ezio Melotti
2df6a93916
Issue #5057 : fix a bug in the peepholer that led to non-portable pyc files between narrow and wide builds while optimizing BINARY_SUBSCR on non-BMP chars (e.g. "\U00012345"[0]).
2011-04-15 16:38:34 +03:00
Senthil Kumaran
b496159603
merge from 3.2
2011-04-15 18:22:05 +08:00
Senthil Kumaran
b4bd4af8c4
merge from 3.1
2011-04-15 18:21:26 +08:00
Senthil Kumaran
397eb4411a
Issue #11467 : Fix urlparse behavior when handling urls which contains scheme specific part only digits.
2011-04-15 18:20:24 +08:00
Ezio Melotti
a15f614a0c
#11845 : Merge with 3.2.
2011-04-15 08:19:32 +03:00
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