summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | Patch by Jonathan Kotta.
* | | 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
|\ \ \ | |/ / | | | | | | Patch by Serhiy Storchaka.
| * | Merge issue #16477: Close tarfile internal handlers in case of exception.Andrew Svetlov2012-11-291-13/+11
| |\ \ | | |/ | | | | | | Patch by Serhiy Storchaka.
| | * Issue #16477: Close tarfile internal handlers in case of exception.Andrew Svetlov2012-11-291-13/+11
| | | | | | | | | | | | Patch by Serhiy Storchaka.
* | | #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 ↵Ezio Melotti2012-11-294-9/+84
| | | | | | | | | | | | by Berker Peksag and Serhiy Storchaka.
* | | Cleanup json decoder: float() has builtin support of nan, +inf, -inf since ↵Victor Stinner2012-11-281-11/+3
| | | | | | | | | | | | Python 2.6
* | | #16333: fix example in docstring.Ezio Melotti2012-11-281-2/+1
| | |
* | | #16333: use (",", ": ") as default separator when indent is specified to ↵Ezio Melotti2012-11-284-14/+31
| | | | | | | | | | | | avoid trailing whitespace. Patch by Serhiy Storchaka.
* | | #16333: null merge with 3.3.Ezio Melotti2012-11-280-0/+0
|\ \ \ | |/ /
| * | #16333: merge with 3.2.Ezio Melotti2012-11-283-6/+26
| |\ \ | | |/
| | * #16333: document a way to get rid of trailing whitespace when indent is used.Ezio Melotti2012-11-283-6/+26
| | |
* | | Revert duplicate changes in argparse docs.Andrew Svetlov2012-11-281-15/+0
|\ \ \ | |/ /
| * | Revert duplicate changes in argparse docs.Andrew Svetlov2012-11-281-15/+0
| |\ \ | | |/
| | * Revert duplicate changes in argparse docs.Andrew Svetlov2012-11-281-15/+0
| | |
* | | Merge issue #11076: document the way to convert argparse.Namespace to a dict.Andrew Svetlov2012-11-281-0/+15
|\ \ \ | |/ / | | | | | | Initial patch by Virgil Dupras.
| * | Merge issue #11076: document the way to convert argparse.Namespace to a dict.Andrew Svetlov2012-11-281-0/+15
| |\ \ | | |/ | | | | | | Initial patch by Virgil Dupras.
| | * Issue #11076: document the way to convert argparse.Namespace to a dict.Andrew Svetlov2012-11-281-0/+15
| | | | | | | | | | | | Initial patch by Virgil Dupras.
* | | Null merge from 3.3.Chris Jerdonek2012-11-280-0/+0
|\ \ \ | |/ /
| * | Merge heads.Chris Jerdonek2012-11-281-20/+24
| |\ \
* | \ \ Merge heads.Chris Jerdonek2012-11-281-20/+24
|\ \ \ \
| * \ \ \ Merge issue #16323: Fix wrong C API documentation for locale encoding.Andrew Svetlov2012-11-281-20/+24
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Patch by Berker Peksag.
| | * | | Issue #16323: Fix wrong C API documentation for locale encoding.Andrew Svetlov2012-11-281-20/+24
| | | | | | | | | | | | | | | | | | | | Patch by Berker Peksag.
* | | | | Merge from 3.3: improve argument/parameter documentation (issue #15990).Chris Jerdonek2012-11-283-18/+99
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge from 3.2: improve argument/parameter documentation (issue #15990).Chris Jerdonek2012-11-283-18/+99
| |\ \ \ | | |/ / | |/| / | | |/
| | * Improve argument/parameter documentation (issue #15990).Chris Jerdonek2012-11-283-18/+99
| | | | | | | | | | | | | | | | | | This commit adds "parameter" to the glossary, improves and consolidates the "argument" glossary entry, and adds a question to the FAQ on the difference between arguments and parameters.
* | | Merge from 3.3: Add a str class entry to the string section (issue #16209).Chris Jerdonek2012-11-286-56/+78
|\ \ \ | |/ / | | | | | | | | | | | | This commit also moves the documentation for the str built-in function to the new class entry. Links to :class:`str` now go to the class entry with the string methods immediately afterwards.
| * | Add a str class entry to the "Text Sequence Type" section (issue #16209).Chris Jerdonek2012-11-286-56/+78
| | | | | | | | | | | | | | | | | | This commit also moves the documentation for the str built-in function to the new class entry. Links to :class:`str` now go to the class entry with the string methods immediately afterwards.
* | | Issue #16464: reset Request's Content-Length header on .data change.Andrew Svetlov2012-11-273-2/+72
| | | | | | | | | | | | | | | | | | It will be recalculated on sending request to HTTP server. Patch by Alexey Kachayev
* | | null mergeGregory P. Smith2012-11-270-0/+0
|\ \ \ | |/ /
| * | null merge (3.3 is different)Gregory P. Smith2012-11-270-0/+0
| |\ \ | | |/
| | * Plug a leak in timemodule. The module dictionary is saved duringGregory P. Smith2012-11-272-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | initialization. If the interpreter is shut down and reinitialized (embedded CPython), the old module dictionary was not dec-refed during the next import of the time extension module. Contributed by Torsten Marek of Google.
* | | #16556: merge with 3.3.Ezio Melotti2012-11-271-1/+1
|\ \ \ | |/ /
| * | #16556: merge with 3.2.Ezio Melotti2012-11-271-1/+1
| |\ \ | | |/
| | * #16556: Fix inconsistency between kwds and kwargs. Patch by Taavi Burns.Ezio Melotti2012-11-271-1/+1
| | |