Terry Jan Reedy
3e8a7ad7fc
Issue #25519 : Mark difflib.ndiff as a functions where not already.
2015-10-30 19:41:16 -04:00
Terry Jan Reedy
4df429618d
Merge with 3.5
2015-10-30 19:26:03 -04:00
Terry Jan Reedy
3f209b63f5
Merge with 3.4
2015-10-30 19:25:50 -04:00
Terry Jan Reedy
a05e7f6743
Issue #25505 : Remove unused buggy method.
2015-10-30 19:25:34 -04:00
Brett Cannon
213b4056a6
Issue #25487 : Fix tests not updated when the imp module moved to a
...
DeprecationWarning.
Thanks to Martin Panter for finding the tests.
2015-10-30 14:41:06 -07:00
Terry Jan Reedy
c6d17c04bc
Merge with 3.5
2015-10-30 02:47:48 -04:00
Terry Jan Reedy
dc22031a61
Merge with 3.4
2015-10-30 02:47:33 -04:00
Terry Jan Reedy
bbdc065506
Issue #25507 : move test-specific imports to test function (idlelib.IOBinding).
2015-10-30 02:47:06 -04:00
Benjamin Peterson
e448066268
merge 3.5 ( #25504 )
2015-10-29 21:11:29 -07:00
Benjamin Peterson
adf8627f41
merge 3.4 ( #25504 )
2015-10-29 21:11:22 -07:00
Benjamin Peterson
dcc13ef1e9
fix usage of undefined name ( #25504 )
2015-10-29 21:10:57 -07:00
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
