summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* #16333: use (",", ": ") as default separator when indent is specified to avoi...Ezio Melotti2012-11-284-14/+31
* #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
|\ \ \ | |/ /
| * | Merge issue #11076: document the way to convert argparse.Namespace to a dict.Andrew Svetlov2012-11-281-0/+15
| |\ \ | | |/
| | * Issue #11076: document the way to convert argparse.Namespace to a dict.Andrew Svetlov2012-11-281-0/+15
* | | 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
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Issue #16323: Fix wrong C API documentation for locale encoding.Andrew Svetlov2012-11-281-20/+24
* | | | | 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
* | | Merge from 3.3: Add a str class entry to the string section (issue #16209).Chris Jerdonek2012-11-286-56/+78
|\ \ \ | |/ /
| * | Add a str class entry to the "Text Sequence Type" section (issue #16209).Chris Jerdonek2012-11-286-56/+78
* | | Issue #16464: reset Request's Content-Length header on .data change.Andrew Svetlov2012-11-273-2/+72
* | | 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
* | | #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
* | | #16559: merge with 3.3.Ezio Melotti2012-11-264-15/+47
|\ \ \ | |/ /
| * | #16559: merge with 3.2.Ezio Melotti2012-11-264-15/+47
| |\ \ | | |/
| | * #16559: Add more tests for the json module. Patch by Serhiy Storchaka.Ezio Melotti2012-11-264-15/+47
* | | Merge from 3.3: add hyperlinks to some os.path function docs (issue #16552).Chris Jerdonek2012-11-261-6/+9
|\ \ \ | |/ /
| * | Merge from 3.2: add hyperlinks to some os.path function docs (issue #16552).Chris Jerdonek2012-11-261-6/+9
| |\ \ | | |/
| | * Add hyperlinks to the docs of some os.path functions (issue #16552).Chris Jerdonek2012-11-261-6/+9
| * | Null merge for fix for #16521.Vinay Sajip2012-11-250-0/+0
| |\ \ | | |/
| | * Closes #16521: Improved error handling for basicConfig(), added tests for same.Vinay Sajip2012-11-252-9/+168
* | | Issue #16546: merge fix from 3.3Mark Dickinson2012-11-257-24/+36
|\ \ \ | |/ /
| * | Issue #16546: make ast.YieldFrom argument mandatory.Mark Dickinson2012-11-257-24/+36
* | | Issue #12848: The pure Python pickle implementation now treats object lengths...Antoine Pitrou2012-11-243-14/+31
|\ \ \ | |/ /
| * | Issue #12848: The pure Python pickle implementation now treats object lengths...Antoine Pitrou2012-11-243-14/+31
| |\ \ | | |/
| | * Issue #12848: The pure Python pickle implementation now treats object lengths...Antoine Pitrou2012-11-243-14/+31
* | | Fix missing import (followup to #4473).Antoine Pitrou2012-11-241-1/+3
* | | Issue #16423: urllib.request now has support for ``data:`` URLs.Antoine Pitrou2012-11-245-5/+137
* | | Merge debug print removal with 3.3.Ezio Melotti2012-11-231-4/+0
|\ \ \ | |/ /
| * | Merge debug print removal with 3.2.Ezio Melotti2012-11-231-4/+0
| |\ \ | | |/
| | * Remove debug print.Ezio Melotti2012-11-231-4/+0
* | | Merged upstream changes.Vinay Sajip2012-11-234-38/+242
|\ \ \
| * | | Issue #4473: Add a POP3.stls() to switch a clear-text POP3 session into an en...Antoine Pitrou2012-11-234-39/+176
| * | | Issue #4473: Add a POP3.capa() method to query the capabilities advertised by...Antoine Pitrou2012-11-234-0/+57