summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Issue25506: Fixed a copy-pasting error in test_pprint.Serhiy Storchaka2015-10-291-1/+1
|\ | | | | | | Patch by John Mark Vandenberg.
| * Issue25506: Fixed a copy-pasting error in test_pprint.Serhiy Storchaka2015-10-291-1/+1
| | | | | | | | Patch by John Mark Vandenberg.
* | Null mergeSerhiy Storchaka2015-10-290-0/+0
|\ \ | |/
| * Merge headsSerhiy Storchaka2015-10-295-7/+2
| |\
* | \ Merge headsSerhiy Storchaka2015-10-295-7/+2
|\ \ \
| * \ \ merge 3.5 (#25502)Benjamin Peterson2015-10-285-7/+2
| |\ \ \ | | | |/ | | |/|
| | * | remove duplicated imports (closes #25502)Benjamin Peterson2015-10-285-7/+2
| | | |
* | | | Issue #25503: Fixed inspect.getdoc() for inherited docstrings of properties.Serhiy Storchaka2015-10-295-9/+19
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| Original patch by John Mark Vandenberg.
| * | Issue #25503: Fixed inspect.getdoc() for inherited docstrings of properties.Serhiy Storchaka2015-10-295-9/+19
| |/ | | | | | | Original patch by John Mark Vandenberg.
* | Issue #21827: Fixed textwrap.dedent() for the case when largest commonSerhiy Storchaka2015-10-284-4/+18
|\ \ | |/ | | | | | | whitespace is a substring of smallest leading whitespace. Based on patch by Robert Li.
| * Issue #21827: Fixed textwrap.dedent() for the case when largest commonSerhiy Storchaka2015-10-284-4/+18
| |\ | | | | | | | | | | | | whitespace is a substring of smallest leading whitespace. Based on patch by Robert Li.
| | * Issue #21827: Fixed textwrap.dedent() for the case when largest commonSerhiy Storchaka2015-10-284-4/+18
| | | | | | | | | | | | | | | whitespace is a substring of smallest leading whitespace. Based on patch by Robert Li.
* | | Merge with 3.5Terry Jan Reedy2015-10-281-4/+4
|\ \ \ | |/ /
| * | Merge with 3.4Terry Jan Reedy2015-10-281-4/+4
| |\ \ | | |/
| | * Issue #25432: Explain isinstance behaviour when type is a tuple.Terry Jan Reedy2015-10-281-4/+4
| | |
* | | Closes #25494: Merge with 3.5Zachary Ware2015-10-271-1/+1
|\ \ \ | |/ /
| * | Issue #25494: Merge with 3.4Zachary Ware2015-10-271-1/+1
| |\ \ | | |/
| | * Issue #25494: Remove extra quote from docstring.Zachary Ware2015-10-271-1/+1
| | | | | | | | | | | | Patch by John Mark Vandenberg.
* | | Merge with 3.5Terry Jan Reedy2015-10-271-3/+5
|\ \ \ | |/ /
| * | Merge with 3.4Terry Jan Reedy2015-10-271-3/+5
| |\ \ | | |/
| | * Display IDLE warning as a warning rather than as an error.Terry Jan Reedy2015-10-271-3/+5
| | | | | | | | | | | | | | | Clarify message and expected action for beginners. Guard against astral chars in path incorporated in message.
* | | Fix a variable typo by switching to a f-string.Brett Cannon2015-10-261-1/+1
| | |
* | | Issue #23391: Merge OSError doc from 3.5Martin Panter2015-10-262-26/+60
|\ \ \ | |/ /
| * | Issue #23391: Merge OSError doc from 3.4 into 3.5Martin Panter2015-10-262-26/+60
| |\ \ | | |/
| | * Issue #23391: Restore OSError constructor argument documentationMartin Panter2015-10-262-26/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This restores details lost in revision 097f4fda61a4 (since Python 3.3, related to the new OSError subclasses). Further additions: * Markup for attributes and constructor signature * Explain "winerror" and "filename2" * Extend test to check for filename2 defaulting to None * Clarify that the constructor can return a subclass I have intentionally left out any details of allowing more than five arguments, or how the "args" attribute is set for four or more arguments. These details seem to be dependent on the Python version and platform.
* | | Issue 25311: Add support for f-strings to tokenize.py. Also added some ↵Eric V. Smith2015-10-262-51/+84
| | | | | | | | | | | | comments to explain what's happening, since it's not so obvious.
* | | Issue #25154: Make the file argument apply to the print function andBrett Cannon2015-10-251-1/+1
| | | | | | | | | | | | not str.format call.
* | | Merge with 3.5Zachary Ware2015-10-240-0/+0
|\ \ \ | |/ /
| * | Null merge with 3.4Zachary Ware2015-10-240-0/+0
| |\ \ | | |/ | | | | | | (tkinter._fix no longer exists in 3.5+)
| | * Issue #25456: Fix test_idle when Tcl/Tk DLLs are loaded from python.exe's homeZachary Ware2015-10-241-2/+4
| | | | | | | | | | | | rather than from elsewhere on PATH.
* | | merge 3.5 (#25471)Benjamin Peterson2015-10-243-1/+9
|\ \ \ | |/ /
| * | merge 3.4 (#25471)Benjamin Peterson2015-10-243-1/+9
| |\ \ | | |/
| | * accepted sockets shouldn't inherit the SOCK_NONBLOCK flag (closes #25471)Benjamin Peterson2015-10-243-1/+9
| | |
* | | Issue21160: Correct comments in nturl2path. Patch by Jurko Gospodnetić.Serhiy Storchaka2015-10-241-5/+7
|\ \ \ | |/ /
| * | Issue21160: Correct comments in nturl2path. Patch by Jurko Gospodnetić.Serhiy Storchaka2015-10-241-5/+7
| |\ \ | | |/
| | * Issue21160: Correct comments in nturl2path. Patch by Jurko Gospodnetić.Serhiy Storchaka2015-10-241-5/+7
| | |
* | | Removed redundant call of update_wrapper().Serhiy Storchaka2015-10-241-1/+1
|\ \ \ | |/ /
| * | Removed redundant call of update_wrapper().Serhiy Storchaka2015-10-241-1/+1
| | |
* | | Issue #25447: The lru_cache() wrapper objects now can be copied and pickledSerhiy Storchaka2015-10-243-2/+66
|\ \ \ | |/ / | | | | | | (by returning the original object unchanged).
| * | Issue #25447: The lru_cache() wrapper objects now can be copied and pickledSerhiy Storchaka2015-10-243-2/+66
| | | | | | | | | | | | (by returning the original object unchanged).
* | | Null merge with 3.5Zachary Ware2015-10-240-0/+0
|\ \ \ | |/ /
| * | Null merge with 3.4Zachary Ware2015-10-240-0/+0
| |\ \ | | |/
| | * Closes #25456: Copy Tcl/Tk DLLs to build directory on WindowsZachary Ware2015-10-242-3/+15
| | | | | | | | | | | | | | | | | | This removes the need to add externals/tcltk[64]/bin to PATH to be able to import tkinter. Also documents the necessity for the DLLs to be on PATH or in python.exe's directory.
* | | Issue #24633: Removes automatic rename of site-packages/README since ↵Steve Dower2015-10-231-6/+0
| | | | | | | | | | | | README.txt is now committed.
* | | Moves Windows installer externals onto SVN and updates the build process to ↵Steve Dower2015-10-238-70/+100
|\ \ \ | |/ / | | | | | | grab them automatically.
| * | Moves Windows installer externals onto SVN and updates the build process to ↵Steve Dower2015-10-238-70/+100
| | | | | | | | | | | | grab them automatically.
* | | Merge 3.4 (Issue #25461)Victor Stinner2015-10-232-3/+4
|\ \ \ | |/ /
| * | Merge 3.4 (Issue #25461)Victor Stinner2015-10-232-3/+4
| |\ \ | | |/
| | * Issue #25461: Rephrase os.walk() docVictor Stinner2015-10-232-3/+4
| | | | | | | | | | | | Patch written by Bernt Røskar Brenna.
* | | Removed unused parameterRaymond Hettinger2015-10-221-10/+10
| | |