Commit graph

58169 commits

Author SHA1 Message Date
Benjamin Peterson
661c346ab3 merge 3.3 2012-12-02 12:37:09 -05:00
Benjamin Peterson
2f560fa300 loosen test now that bytes are allowed 2012-12-02 12:37:04 -05:00
Benjamin Peterson
c77dd20698 merge 3.3 2012-12-02 11:33:14 -05:00
Benjamin Peterson
78f7e3a8dc document UnicodeError attributes 2012-12-02 11:33:06 -05:00
Benjamin Peterson
196035595f document that encoding error handlers may return bytes (#16585) 2012-12-02 11:26:10 -05:00
Benjamin Peterson
26e5335a46 merge 3.3 (#16585) 2012-12-02 11:21:02 -05:00
Benjamin Peterson
47a00f3d1a support encoding error handlers that return bytes (closes #16585) 2012-12-02 11:20:28 -05:00
Benjamin Peterson
3d490d4eff merge 3.3 2012-12-02 10:53:48 -05:00
Benjamin Peterson
aff472394c unicode -> str 2012-12-02 10:53:41 -05:00
Mark Dickinson
96e2cdbae9 Issue 10052: null merge from 3.3 2012-12-02 13:22:32 +00:00
Mark Dickinson
6e61d18891 Issue 10052: merge fix from 3.2. 2012-12-02 13:21:37 +00:00
Mark Dickinson
ce31f66a6d Issue 10052: fix failed uint32_t / uint64_t / int32_t / int64_t detection on some platforms. 2012-12-02 13:20:22 +00:00
Mark Dickinson
983bc16c15 Issue 10052: fix failed uint32_t / uint64_t / int32_t / int64_t detection on some platforms. 2012-12-02 12:11:38 +00:00
Antoine Pitrou
d8d1a0ab78 Issue #10182: The re module doesn't truncate indices to 32 bits anymore.
Patch by Serhiy Storchaka.
2012-12-02 12:55:12 +01:00
Antoine Pitrou
9a2b26748b Issue #10182: The re module doesn't truncate indices to 32 bits anymore.
Patch by Serhiy Storchaka.
2012-12-02 12:54:28 +01:00
Antoine Pitrou
43fb54cd4f Issue #10182: The re module doesn't truncate indices to 32 bits anymore.
Patch by Serhiy Storchaka.
2012-12-02 12:52:36 +01:00
Christian Heimes
4569467539 Issue #16588: Silence unused-but-set warnings in Python/thread_pthread.h 2012-12-02 08:39:23 +01:00
Christian Heimes
17485bf6f9 Issue #16588: Silence unused-but-set warnings in Python/thread_pthread.h 2012-12-02 08:38:42 +01:00
Christian Heimes
56379c0d8f Issue #16588: Silence unused-but-set warnings in Python/thread_pthread.h 2012-12-02 08:37:00 +01:00
Christian Heimes
550ab5136a null merge 2012-12-02 08:26:02 +01:00
Christian Heimes
98cd0f262d Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf 2012-12-02 08:23:05 +01:00
Christian Heimes
8ca1d5f762 - Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf 2012-12-02 08:14:50 +01:00
Christian Heimes
5f7e8dab11 Issue #16592: stringlib_bytes_join doesn't raise MemoryError on allocation failure 2012-12-02 07:56:42 +01:00
Christian Heimes
17ad40e46e Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf 2012-12-02 07:37:35 +01:00
Antoine Pitrou
cbb028466b Issue #16590: remove obsolete compatibility code from the _json module.
Patch by Serhiy Storchaka.
2012-12-01 19:34:16 +01:00
Benjamin Peterson
f02f280b87 Add Bruno Dupuis 2012-11-30 16:15:24 -05:00
Benjamin Peterson
4089eec098 merge 3.3 (#16573) 2012-11-29 10:58:43 -05:00
Benjamin Peterson
daf28293e1 merge 3.2 2012-11-29 10:57:11 -05:00
Benjamin Peterson
343d530d67 add changelog 2012-11-29 10:57:01 -05:00
Benjamin Peterson
139891ba82 merge 3.2 (#16573) 2012-11-29 10:56:11 -05:00
Benjamin Peterson
57af38700a enumerate only requires an iterable (closes #16573)
Patch by Jonathan Kotta.
2012-11-29 10:55:22 -05:00
Andrew Svetlov
1d1210ec3b Merge: remove redundant sentence from c-api docs (issue #16323) 2012-11-29 15:23:46 +02:00
Andrew Svetlov
f4c3a187d5 Remove redundant sentence from c-api docs (issue #16323) 2012-11-29 15:23:15 +02:00
Andrew Svetlov
7030dd8500 Merge issue #16477: Close tarfile internal handlers in case of exception.
Patch by Serhiy Storchaka.
2012-11-29 14:21:39 +02:00
Andrew Svetlov
7ecd13da5f Merge issue #16477: Close tarfile internal handlers in case of exception.
Patch by Serhiy Storchaka.
2012-11-29 14:21:23 +02:00
Andrew Svetlov
718df1d638 Issue #16477: Close tarfile internal handlers in case of exception.
Patch by Serhiy Storchaka.
2012-11-29 14:20:47 +02:00
Ezio Melotti
63cd0aa569 #16549: merge with 3.3. 2012-11-29 05:10:45 +02:00
Ezio Melotti
159f12e335 #16549: merge with 3.2. 2012-11-29 05:10:31 +02:00
Ezio Melotti
4927633ab6 #16549: fix test failures on Windows. 2012-11-29 05:10:07 +02:00
Ezio Melotti
fc02014519 #16333: add Misc/NEWS entry for e63ac05ccfa8. 2012-11-29 02:33:21 +02:00
Ezio Melotti
ccfc970d2e #16476: null merge with 3.3. 2012-11-29 02:27:26 +02:00
Ezio Melotti
4cee810f5d #16476: merge with 3.2. 2012-11-29 02:26:15 +02:00
Ezio Melotti
b32512ed9a #16476: Fix json.tool to avoid including trailing whitespace. 2012-11-29 02:25:03 +02:00
Ezio Melotti
401cf295e5 #16549: merge with 3.3. 2012-11-29 02:18:34 +02:00
Ezio Melotti
1e86d01e1e #16549: merge with 3.2. 2012-11-29 02:16:58 +02:00
Ezio Melotti
057bcb4c6c #16549: Make json.tool work again on Python 3 and add tests. Initial patch by Berker Peksag and Serhiy Storchaka. 2012-11-29 02:15:18 +02:00
Victor Stinner
d7fed37059 Cleanup json decoder: float() has builtin support of nan, +inf, -inf since Python 2.6 2012-11-29 00:12:40 +01:00
Ezio Melotti
9f94b6dc4b #16333: fix example in docstring. 2012-11-29 00:45:22 +02:00
Ezio Melotti
100314427a #16333: use (",", ": ") as default separator when indent is specified to avoid trailing whitespace. Patch by Serhiy Storchaka. 2012-11-29 00:42:56 +02:00
Ezio Melotti
d966c2156a #16333: null merge with 3.3. 2012-11-29 00:37:52 +02:00