Commit Graph

91903 Commits

Author SHA1 Message Date
Benjamin Peterson 4b24d63407 merge 3.5 (#25515) 2015-10-29 20:40:34 -07:00
Benjamin Peterson 788cb52905 always use os.urandom for the uuid4 algorithm (closes #25515) 2015-10-29 20:38:04 -07:00
Serhiy Storchaka fc8a0a584e Issue25506: Fixed a copy-pasting error in test_pprint.
Patch by John Mark Vandenberg.
2015-10-29 09:53:33 +02:00
Serhiy Storchaka 265cee0480 Issue25506: Fixed a copy-pasting error in test_pprint.
Patch by John Mark Vandenberg.
2015-10-29 09:52:20 +02:00
Serhiy Storchaka c257007c0e Null merge 2015-10-29 08:19:59 +02:00
Serhiy Storchaka b2874bc585 Merge heads 2015-10-29 08:19:44 +02:00
Serhiy Storchaka 15f74f44d8 Merge heads 2015-10-29 08:19:22 +02:00
Serhiy Storchaka 6230235e83 Issue #25503: Fixed inspect.getdoc() for inherited docstrings of properties.
Original patch by John Mark Vandenberg.
2015-10-29 08:17:10 +02:00
Serhiy Storchaka ac4bdcc80e Issue #25503: Fixed inspect.getdoc() for inherited docstrings of properties.
Original patch by John Mark Vandenberg.
2015-10-29 08:15:50 +02:00
Benjamin Peterson 860c8a404a merge 3.5 (#25502) 2015-10-28 23:15:22 -07:00
Benjamin Peterson 669ff66c32 remove duplicated imports (closes #25502) 2015-10-28 23:15:13 -07:00
Serhiy Storchaka 2e0e18ba57 Issue #21827: Fixed textwrap.dedent() for the case when largest common
whitespace is a substring of smallest leading whitespace.
Based on patch by Robert Li.
2015-10-28 21:45:01 +02:00
Serhiy Storchaka f8152c67f5 Issue #21827: Fixed textwrap.dedent() for the case when largest common
whitespace is a substring of smallest leading whitespace.
Based on patch by Robert Li.
2015-10-28 21:43:12 +02:00
Serhiy Storchaka ea4cb63e68 Issue #21827: Fixed textwrap.dedent() for the case when largest common
whitespace is a substring of smallest leading whitespace.
Based on patch by Robert Li.
2015-10-28 21:39:36 +02:00
Terry Jan Reedy 549edcfa05 Merge with 3.5 2015-10-28 03:15:38 -04:00
Terry Jan Reedy 44b1020c12 Merge with 3.4 2015-10-28 03:15:20 -04:00
Terry Jan Reedy 68b6874f59 Issue #25432: Explain isinstance behaviour when type is a tuple. 2015-10-28 03:14:56 -04:00
Zachary Ware 24fa60c8d5 Closes #25494: Merge with 3.5 2015-10-27 22:05:09 -05:00
Zachary Ware 32dcf40af0 Issue #25494: Merge with 3.4 2015-10-27 22:01:02 -05:00
Zachary Ware df2660e430 Issue #25494: Remove extra quote from docstring.
Patch by John Mark Vandenberg.
2015-10-27 22:00:41 -05:00
Terry Jan Reedy b44dffdca1 Merge with 3.5 2015-10-27 03:38:31 -04:00
Terry Jan Reedy b1f1c5ea35 Merge with 3.4 2015-10-27 03:38:18 -04:00
Terry Jan Reedy 4c973e9a4b Display IDLE warning as a warning rather than as an error.
Clarify message and expected action for beginners.
Guard against astral chars in path incorporated in message.
2015-10-27 03:38:02 -04:00
Brett Cannon dd1e670758 Fix a variable typo by switching to a f-string. 2015-10-26 17:11:04 -07:00
Martin Panter d7475fb3c8 Issue #23391: Merge OSError doc from 3.5 2015-10-26 23:35:43 +00:00
Martin Panter 084b368825 Issue #23391: Merge OSError doc from 3.4 into 3.5 2015-10-26 23:35:07 +00:00
Martin Panter 5487c13e44 Issue #23391: Restore OSError constructor argument documentation
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.
2015-10-26 11:05:42 +00:00
Eric V. Smith 1c8222c80a Issue 25311: Add support for f-strings to tokenize.py. Also added some comments to explain what's happening, since it's not so obvious. 2015-10-26 04:37:55 -04:00
Brett Cannon f1c47e4751 Issue #25154: Make the file argument apply to the print function and
not str.format call.
2015-10-25 17:40:31 -07:00
Zachary Ware 3188f1dcba Merge with 3.5 2015-10-24 23:27:03 -05:00
Zachary Ware 8e66a73702 Null merge with 3.4
(tkinter._fix no longer exists in 3.5+)
2015-10-24 23:26:42 -05:00
Zachary Ware f085a16f55 Issue #25456: Fix test_idle when Tcl/Tk DLLs are loaded from python.exe's home
rather than from elsewhere on PATH.
2015-10-24 23:22:16 -05:00
Benjamin Peterson 2374ad7dd9 merge 3.5 (#25471) 2015-10-24 20:07:28 -07:00
Benjamin Peterson 2775d85d55 merge 3.4 (#25471) 2015-10-24 20:07:08 -07:00
Benjamin Peterson d9dbf49383 accepted sockets shouldn't inherit the SOCK_NONBLOCK flag (closes #25471) 2015-10-24 20:06:04 -07:00
Serhiy Storchaka b75e7f5269 Issue21160: Correct comments in nturl2path. Patch by Jurko Gospodnetić. 2015-10-24 17:43:28 +03:00
Serhiy Storchaka 0a467d1b86 Issue21160: Correct comments in nturl2path. Patch by Jurko Gospodnetić. 2015-10-24 17:42:44 +03:00
Serhiy Storchaka 458123bd18 Issue21160: Correct comments in nturl2path. Patch by Jurko Gospodnetić. 2015-10-24 17:39:36 +03:00
Serhiy Storchaka 97a763d104 Removed redundant call of update_wrapper(). 2015-10-24 09:52:09 +03:00
Serhiy Storchaka ce2295def3 Removed redundant call of update_wrapper(). 2015-10-24 09:51:53 +03:00
Serhiy Storchaka dcd1a0309f Issue #25447: The lru_cache() wrapper objects now can be copied and pickled
(by returning the original object unchanged).
2015-10-24 09:50:19 +03:00
Serhiy Storchaka 45120f272b Issue #25447: The lru_cache() wrapper objects now can be copied and pickled
(by returning the original object unchanged).
2015-10-24 09:49:56 +03:00
Zachary Ware 21960a3db4 Null merge with 3.5 2015-10-24 01:36:23 -05:00
Zachary Ware a7b83b43ff Null merge with 3.4 2015-10-24 01:35:44 -05:00
Zachary Ware 677744b386 Closes #25456: Copy Tcl/Tk DLLs to build directory on Windows
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.
2015-10-24 01:34:22 -05:00
Steve Dower 5b6f3644e6 Issue #24633: Removes automatic rename of site-packages/README since README.txt is now committed. 2015-10-23 13:24:03 -07:00
Steve Dower fe3e7a006e Moves Windows installer externals onto SVN and updates the build process to grab them automatically. 2015-10-23 09:51:16 -07:00
Steve Dower d28a8a994b Moves Windows installer externals onto SVN and updates the build process to grab them automatically. 2015-10-23 09:50:49 -07:00
Victor Stinner 4487a46727 Merge 3.4 (Issue #25461) 2015-10-23 12:39:20 +02:00
Victor Stinner de6e800f45 Merge 3.4 (Issue #25461) 2015-10-23 12:39:01 +02:00