summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge 3.3Benjamin Peterson2012-12-022-4/+7
|\
| * more test to more general test file, so it can test more thingsBenjamin Peterson2012-12-022-4/+7
* | merge 3.3Benjamin Peterson2012-12-021-1/+1
|\ \ | |/
| * loosen test now that bytes are allowedBenjamin Peterson2012-12-021-1/+1
* | merge 3.3Benjamin Peterson2012-12-022-7/+34
|\ \ | |/
| * document UnicodeError attributesBenjamin Peterson2012-12-021-0/+24
| * document that encoding error handlers may return bytes (#16585)Benjamin Peterson2012-12-021-7/+10
* | merge 3.3 (#16585)Benjamin Peterson2012-12-023-2/+13
|\ \ | |/
| * support encoding error handlers that return bytes (closes #16585)Benjamin Peterson2012-12-023-2/+13
* | merge 3.3Benjamin Peterson2012-12-021-3/+3
|\ \ | |/
| * unicode -> strBenjamin Peterson2012-12-021-3/+3
* | Issue 10052: null merge from 3.3Mark Dickinson2012-12-020-0/+0
|\ \ | |/
| * Issue 10052: merge fix from 3.2.Mark Dickinson2012-12-024-8/+93
| |\
| | * Issue 10052: fix failed uint32_t / uint64_t / int32_t / int64_t detection on ...Mark Dickinson2012-12-024-8/+93
* | | Issue 10052: fix failed uint32_t / uint64_t / int32_t / int64_t detection on ...Mark Dickinson2012-12-024-8/+93
* | | Issue #10182: The re module doesn't truncate indices to 32 bits anymore.Antoine Pitrou2012-12-023-6/+24
|\ \ \ | |/ /
| * | Issue #10182: The re module doesn't truncate indices to 32 bits anymore.Antoine Pitrou2012-12-023-6/+24
| |\ \ | | |/
| | * Issue #10182: The re module doesn't truncate indices to 32 bits anymore.Antoine Pitrou2012-12-023-6/+24
* | | Issue #16588: Silence unused-but-set warnings in Python/thread_pthread.hChristian Heimes2012-12-022-0/+5
|\ \ \ | |/ /
| * | Issue #16588: Silence unused-but-set warnings in Python/thread_pthread.hChristian Heimes2012-12-022-0/+5
| |\ \ | | |/
| | * Issue #16588: Silence unused-but-set warnings in Python/thread_pthread.hChristian Heimes2012-12-022-0/+5
* | | null mergeChristian Heimes2012-12-020-0/+0
|\ \ \ | |/ /
| * | Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel ShahafChristian Heimes2012-12-022-2/+5
| |\ \ | | |/
| | * - Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel ShahafChristian Heimes2012-12-022-2/+5
* | | Issue #16592: stringlib_bytes_join doesn't raise MemoryError on allocation fa...Christian Heimes2012-12-022-0/+4
* | | Have BSD 'make -s' do the right thing, thanks to Daniel ShahafChristian Heimes2012-12-023-2/+6
* | | Issue #16590: remove obsolete compatibility code from the _json module.Antoine Pitrou2012-12-011-40/+5
* | | Add Bruno DupuisBenjamin Peterson2012-11-301-0/+1
* | | merge 3.3 (#16573)Benjamin Peterson2012-11-293-6/+22
|\ \ \ | |/ /
| * | merge 3.2Benjamin Peterson2012-11-291-0/+4
| |\ \ | | |/
| | * add changelogBenjamin Peterson2012-11-291-0/+4
| * | merge 3.2 (#16573)Benjamin Peterson2012-11-292-6/+18
| |\ \ | | |/
| | * enumerate only requires an iterable (closes #16573)Benjamin Peterson2012-11-292-6/+18
* | | Merge: remove redundant sentence from c-api docs (issue #16323)Andrew Svetlov2012-11-291-4/+1
|\ \ \ | |/ /
| * | Remove redundant sentence from c-api docs (issue #16323)Andrew Svetlov2012-11-291-4/+1
* | | Merge issue #16477: Close tarfile internal handlers in case of exception.Andrew Svetlov2012-11-291-13/+11
|\ \ \ | |/ /
| * | Merge issue #16477: Close tarfile internal handlers in case of exception.Andrew Svetlov2012-11-291-13/+11
| |\ \ | | |/
| | * Issue #16477: Close tarfile internal handlers in case of exception.Andrew Svetlov2012-11-291-13/+11
* | | #16549: merge with 3.3.Ezio Melotti2012-11-291-2/+2
|\ \ \ | |/ /
| * | #16549: merge with 3.2.Ezio Melotti2012-11-291-2/+2
| |\ \ | | |/
| | * #16549: fix test failures on Windows.Ezio Melotti2012-11-291-2/+2
* | | #16333: add Misc/NEWS entry for e63ac05ccfa8.Ezio Melotti2012-11-291-0/+3
* | | #16476: null merge with 3.3.Ezio Melotti2012-11-290-0/+0
|\ \ \ | |/ /
| * | #16476: merge with 3.2.Ezio Melotti2012-11-293-9/+12
| |\ \ | | |/
| | * #16476: Fix json.tool to avoid including trailing whitespace.Ezio Melotti2012-11-293-9/+12
* | | #16549: merge with 3.3.Ezio Melotti2012-11-294-9/+84
|\ \ \ | |/ /
| * | #16549: merge with 3.2.Ezio Melotti2012-11-294-9/+84
| |\ \ | | |/
| | * #16549: Make json.tool work again on Python 3 and add tests. Initial patch b...Ezio Melotti2012-11-294-9/+84
* | | Cleanup json decoder: float() has builtin support of nan, +inf, -inf since Py...Victor Stinner2012-11-281-11/+3
* | | #16333: fix example in docstring.Ezio Melotti2012-11-281-2/+1