Benjamin Peterson [Fri, 4 Mar 2016 06:10:52 +0000 (22:10 -0800)]
merge 3.5 (closes #26478)
Benjamin Peterson [Fri, 4 Mar 2016 06:08:01 +0000 (22:08 -0800)]
merge 3.4 (closes #26478)
Benjamin Peterson [Fri, 4 Mar 2016 06:05:36 +0000 (22:05 -0800)]
properly use the ObjArgs variant of CallMethod in dictview binary operations (closes #26478)
Berker Peksag [Wed, 2 Mar 2016 17:40:50 +0000 (19:40 +0200)]
Issue #26246: Set initial value of the hidden attr when creating copy button.
Patch by Liang-Bo Wang.
Berker Peksag [Wed, 2 Mar 2016 17:40:30 +0000 (19:40 +0200)]
Issue #26246: Set initial value of the hidden attr when creating copy button.
Patch by Liang-Bo Wang.
Berker Peksag [Wed, 2 Mar 2016 17:40:08 +0000 (19:40 +0200)]
Issue #26246: Set initial value of the hidden attr when creating copy button.
Patch by Liang-Bo Wang.
Berker Peksag [Wed, 2 Mar 2016 17:30:18 +0000 (19:30 +0200)]
Issue #26335: Make mmap.write() return the number of bytes written like
other write methods.
Patch by Jakub Stasiak.
Yury Selivanov [Wed, 2 Mar 2016 16:31:06 +0000 (11:31 -0500)]
Merge 3.5 (issue #25888)
Yury Selivanov [Wed, 2 Mar 2016 16:30:46 +0000 (11:30 -0500)]
coroutines: Error when awaiting on coroutine that's being awaited
Issue #25888
Yury Selivanov [Wed, 2 Mar 2016 16:17:18 +0000 (11:17 -0500)]
Merge 3.5 (issue #26338)
Yury Selivanov [Wed, 2 Mar 2016 16:17:01 +0000 (11:17 -0500)]
asyncio: Remove duplicate bind addresses in create_server.
Patch by Sebastien Bourdeauducq (issue #26338)
Yury Selivanov [Wed, 2 Mar 2016 16:08:05 +0000 (11:08 -0500)]
Merge 3.5 (issue #26347)
Yury Selivanov [Wed, 2 Mar 2016 16:07:47 +0000 (11:07 -0500)]
inspect: Fix BoundArguments.apply_defaults to handle empty arguments
Patch by Frederick Wagner (issue #26347)
Yury Selivanov [Wed, 2 Mar 2016 16:03:53 +0000 (11:03 -0500)]
Merge 3.5 (issue #26221)
Yury Selivanov [Wed, 2 Mar 2016 16:03:28 +0000 (11:03 -0500)]
asyncio: Prevent StopIteration from being thrown into a Future
Patch by Chris Angelico (issue #26221)
Yury Selivanov [Wed, 2 Mar 2016 15:49:36 +0000 (10:49 -0500)]
Merge 3.5 (issue #25647)
Yury Selivanov [Wed, 2 Mar 2016 15:49:16 +0000 (10:49 -0500)]
asyncio: Fix @coroutine to recognize CoroWrapper (issue #25647)
Patch by Vladimir Rutsky.
Yury Selivanov [Wed, 2 Mar 2016 15:43:45 +0000 (10:43 -0500)]
Sync selectors.py with upstream asyncio
Yury Selivanov [Wed, 2 Mar 2016 15:41:51 +0000 (10:41 -0500)]
Merge 3.5
Yury Selivanov [Wed, 2 Mar 2016 15:37:59 +0000 (10:37 -0500)]
asyncio, selectors: Update to the upstream version
Yury Selivanov [Wed, 2 Mar 2016 15:34:05 +0000 (10:34 -0500)]
Merge 3.5
Yury Selivanov [Wed, 2 Mar 2016 15:33:47 +0000 (10:33 -0500)]
Merge 3.4
Yury Selivanov [Wed, 2 Mar 2016 15:33:22 +0000 (10:33 -0500)]
asyncio: Update 3.4 asyncio/test_tasks to upstream version
Raymond Hettinger [Wed, 2 Mar 2016 08:30:58 +0000 (00:30 -0800)]
Factor-out common subexpression.
Raymond Hettinger [Wed, 2 Mar 2016 08:06:21 +0000 (00:06 -0800)]
Put block length computations in a more logical order.
Victor Stinner [Tue, 1 Mar 2016 22:34:47 +0000 (23:34 +0100)]
Update assertion in compiler_addop_i()
In practice, bytecode instruction arguments are unsigned. Update the assertion
to make it more explicit that argument must be greater or equal than 0.
Rewrite also the comment.
Victor Stinner [Tue, 1 Mar 2016 21:07:53 +0000 (22:07 +0100)]
Merge 3.5
Victor Stinner [Tue, 1 Mar 2016 20:59:58 +0000 (21:59 +0100)]
Issue #26464: Fix unicode_fast_translate() again
Initialize i variable if the string is non-ASCII.
Victor Stinner [Tue, 1 Mar 2016 20:30:50 +0000 (21:30 +0100)]
Merge 3.5
Victor Stinner [Tue, 1 Mar 2016 20:30:30 +0000 (21:30 +0100)]
Fix str.translate()
Issue #26464: Fix str.translate() when string is ASCII and first replacements
removes character, but next replacement uses a non-ASCII character or a string
longer than 1 character. Regression introduced in Python 3.5.0.
Serhiy Storchaka [Tue, 1 Mar 2016 08:26:10 +0000 (10:26 +0200)]
Issue #26457: Fixed the subnets() methods in IP network classes for the case
when resulting prefix length is equal to maximal prefix length.
Based on patch by Xiang Zhang.
Serhiy Storchaka [Tue, 1 Mar 2016 08:25:45 +0000 (10:25 +0200)]
Issue #26457: Fixed the subnets() methods in IP network classes for the case
when resulting prefix length is equal to maximal prefix length.
Based on patch by Xiang Zhang.
Terry Jan Reedy [Tue, 1 Mar 2016 06:19:02 +0000 (01:19 -0500)]
Merge with 3.5
Terry Jan Reedy [Tue, 1 Mar 2016 06:18:47 +0000 (01:18 -0500)]
Whitespace
Terry Jan Reedy [Tue, 1 Mar 2016 06:13:21 +0000 (01:13 -0500)]
Merge with 3.5
Terry Jan Reedy [Tue, 1 Mar 2016 06:13:07 +0000 (01:13 -0500)]
Document maintenance of idlelib/help.html in idlelib.
Terry Jan Reedy [Tue, 1 Mar 2016 05:30:20 +0000 (00:30 -0500)]
Merge with 3.5
Terry Jan Reedy [Tue, 1 Mar 2016 05:29:57 +0000 (00:29 -0500)]
Rebase the 3.x version of idlelib/help.html on the 3.5 version of
Doc/build/html/library/idle.html, which is built from Doc/library/idle.rst.
Help.html is an rstrip()ed copy of idle.html that can be pushed.
The displayed content is unchanged because a) the version number is not
displayed, being inherent in the version displaying the file and b) the tt
tag was ignored by the custom parser in idlelib/help.py. The wrapped
<span class="pre"> tags remain as they were.
This will be merged in 3.6 (without conflict) because the 3.6 help.html is
a copy of the 3.5 file (which was a copy of the 3.4 file). The two files will
remain the same until either a) there is a content change that only applies
to one of them or b) 3.5 maintenance ends and the 3.6 file is itself rebased.
Martin Panter [Mon, 29 Feb 2016 11:25:09 +0000 (11:25 +0000)]
Issue #26385: Merge NamedTemporaryFile fix from 3.5
Georg Brandl [Sun, 28 Feb 2016 20:13:44 +0000 (21:13 +0100)]
merge with 3.5
Georg Brandl [Sun, 28 Feb 2016 20:13:23 +0000 (21:13 +0100)]
Update susp-ignore file (#25910).
Georg Brandl [Sun, 28 Feb 2016 20:09:45 +0000 (21:09 +0100)]
merge with 3.5
Georg Brandl [Sun, 28 Feb 2016 20:09:36 +0000 (21:09 +0100)]
Fix typo.
Martin Panter [Sun, 28 Feb 2016 05:22:20 +0000 (05:22 +0000)]
Issue #26385: Cleanup NamedTemporaryFile if open() fails, by SilentGhost
Martin Panter [Sun, 28 Feb 2016 03:29:51 +0000 (03:29 +0000)]
Issue #22836: Merge exception reporting from 3.5
Martin Panter [Sun, 28 Feb 2016 03:16:11 +0000 (03:16 +0000)]
Issue #22836: Keep exception reports sensible despite errors
Ezio Melotti [Sat, 27 Feb 2016 06:42:14 +0000 (08:42 +0200)]
#26246: merge with 3.5.
Ezio Melotti [Sat, 27 Feb 2016 06:41:16 +0000 (08:41 +0200)]
#26246: merge with 3.4.
Ezio Melotti [Sat, 27 Feb 2016 06:39:36 +0000 (08:39 +0200)]
#26246: update copybutton.js after JQuery update. Patch by Liang-Bo Wang.
Victor Stinner [Sat, 27 Feb 2016 01:19:22 +0000 (02:19 +0100)]
compile.c: inline compiler_use_new_block()
* Inline compiler_use_new_block() function into its only callee,
compiler_enter_scope()
* Remove unused NEW_BLOCK() macro
Georg Brandl [Fri, 26 Feb 2016 18:37:52 +0000 (19:37 +0100)]
merge with 3.5
Georg Brandl [Fri, 26 Feb 2016 18:37:12 +0000 (19:37 +0100)]
Closes #25910: fix dead and permanently redirected links in the docs. Thanks to SilentGhost for the patch.
Georg Brandl [Fri, 26 Feb 2016 18:18:05 +0000 (19:18 +0100)]
merge with 3.5
Georg Brandl [Fri, 26 Feb 2016 18:17:39 +0000 (19:17 +0100)]
Fix version.
Georg Brandl [Fri, 26 Feb 2016 18:16:43 +0000 (19:16 +0100)]
merge with 3.5
Georg Brandl [Fri, 26 Feb 2016 18:16:40 +0000 (19:16 +0100)]
Closes #26442: fix copy-paste.
Georg Brandl [Fri, 26 Feb 2016 18:14:56 +0000 (19:14 +0100)]
merge with 3.5
Georg Brandl [Fri, 26 Feb 2016 18:13:47 +0000 (19:13 +0100)]
Closes #26444: typo fixes.
Benjamin Peterson [Fri, 26 Feb 2016 07:25:14 +0000 (23:25 -0800)]
remove unused c_encoding struct member
Benjamin Peterson [Fri, 26 Feb 2016 07:13:53 +0000 (23:13 -0800)]
rewrite parsestr() so it's comprehensible; remove dead code
Benjamin Peterson [Fri, 26 Feb 2016 06:34:45 +0000 (22:34 -0800)]
c_encoding can never be NULL, which allows some code simplification
Martin Panter [Fri, 26 Feb 2016 00:42:33 +0000 (00:42 +0000)]
Dummy merge with 3.5
Martin Panter [Fri, 26 Feb 2016 00:41:38 +0000 (00:41 +0000)]
Issue #26390: Merge pbkdf2_hmac() doc from 3.5
Georg Brandl [Thu, 25 Feb 2016 19:18:00 +0000 (20:18 +0100)]
merge with 3.5
Georg Brandl [Thu, 25 Feb 2016 19:17:45 +0000 (20:17 +0100)]
Closes #26435: fix syntax in directives. Thanks to Jakub Stasiak.
Georg Brandl [Thu, 25 Feb 2016 19:14:21 +0000 (20:14 +0100)]
merge with 3.5
Georg Brandl [Thu, 25 Feb 2016 19:14:10 +0000 (20:14 +0100)]
Fix rstlint to also look for indented comments that should be directives.
Martin Panter [Thu, 25 Feb 2016 12:13:50 +0000 (12:13 +0000)]
Issue #26402: Merge XML-RPC client fix from 3.5
Martin Panter [Thu, 25 Feb 2016 11:53:40 +0000 (11:53 +0000)]
Issue #26402: Fix XML-RPC client retrying after server disconnection
This is a regression introduced in 3.5 by revision
eba80326ba53. Fix by Jelte
Fennema, test case by me.
Serhiy Storchaka [Thu, 25 Feb 2016 11:16:02 +0000 (13:16 +0200)]
Issue #25801: Fixed resource warnings in test_zipfile64.
Patch by SilentGhost.
Serhiy Storchaka [Thu, 25 Feb 2016 10:55:19 +0000 (12:55 +0200)]
Issue #25801: Fixed resource warnings in test_zipfile64.
Patch by SilentGhost.
Raymond Hettinger [Thu, 25 Feb 2016 08:25:45 +0000 (00:25 -0800)]
Fix out-of-date comment
Ned Deily [Wed, 24 Feb 2016 14:35:21 +0000 (01:35 +1100)]
Issue #25136: merge from 3.5
Ned Deily [Wed, 24 Feb 2016 14:34:34 +0000 (01:34 +1100)]
Issue #25136: Add reference to 'xcode-select --install' to Mac README.
Ned Deily [Wed, 24 Feb 2016 14:03:06 +0000 (01:03 +1100)]
Change OS X installer builds targeted for 10.10 and above to build
and link with a private copy of OpenSSL, like installers targeted
for 10.5 already do, since Apple has deprecated use of the system
OpenSSL and removed its header files from the Xcode 7 SDK. Note
that this configuration is not currently used to build any
python.org-supplied installers and that the private copy of
OpenSSL requires its own root certificates.
Ned Deily [Wed, 24 Feb 2016 14:01:48 +0000 (01:01 +1100)]
Change OS X installer builds targeted for 10.10 and above to build
and link with a private copy of OpenSSL, like installers targeted
for 10.5 already do, since Apple has deprecated use of the system
OpenSSL and removed its header files from the Xcode 7 SDK. Note
that this configuration is not currently used to build any
python.org-supplied installers and that the private copy of
OpenSSL requires its own root certificates.
Ned Deily [Wed, 24 Feb 2016 13:59:16 +0000 (00:59 +1100)]
Issue #25136: merge from 3.5
Ned Deily [Wed, 24 Feb 2016 13:56:38 +0000 (00:56 +1100)]
Issue #25136: Support Apple Xcode 7's new textual SDK stub libraries.
As of Xcode 7, SDKs for Apple platforms now include textual-format stub
libraries whose file names have a .tbd extension rather than the
standard OS X .dylib extension. The Apple compiler tool chain handles
these stub libraries transparently and the installed system shared libraries
are still .dylibs. However, the new stub libraries cause problems for
third-party programs that support building with Apple SDKs and make
build-time decisions based on the presence or paths of system-supplied
shared libraries in the SDK. In particular, building Python itself with
an SDK fails to find system-supplied libraries during setup.py's build of
standard library extension modules. The solution is to have
find_library_file() in Distutils search for .tbd files, along with
the existing types (.a, .so, and .dylib). Patch by Tim Smith.
Jason R. Coombs [Wed, 24 Feb 2016 13:50:59 +0000 (08:50 -0500)]
Issue #26302: merge from 3.5
Serhiy Storchaka [Wed, 24 Feb 2016 11:04:33 +0000 (13:04 +0200)]
Null merge
Serhiy Storchaka [Wed, 24 Feb 2016 11:03:54 +0000 (13:03 +0200)]
Fixed a bug in os.walk() with bytes path on Windows caused by merging fixes
for issues #25995 and #25911.
Serhiy Storchaka [Wed, 24 Feb 2016 10:08:11 +0000 (12:08 +0200)]
Issue #25913: Leading <~ is optional now in base64.a85decode() with adobe=True.
Patch by Swati Jaiswal.
Serhiy Storchaka [Wed, 24 Feb 2016 10:05:50 +0000 (12:05 +0200)]
Issue #25913: Leading <~ is optional now in base64.a85decode() with adobe=True.
Patch by Swati Jaiswal.
Martin Panter [Wed, 24 Feb 2016 06:14:15 +0000 (06:14 +0000)]
Issue #5824: Merge socketserver tests from 3.5
Martin Panter [Wed, 24 Feb 2016 05:12:59 +0000 (05:12 +0000)]
Issue #5824: Fix DatagramRequestHandler tests by binding the client socket
Martin Panter [Wed, 24 Feb 2016 01:08:43 +0000 (01:08 +0000)]
Issue #22088: Merge base64 docs from 3.5
Martin Panter [Tue, 23 Feb 2016 22:30:50 +0000 (22:30 +0000)]
Issue #22088: Clarify base-64 alphabets and which characters are discarded
* There are only two base-64 alphabets defined by the RFCs, not three
* Due to the internal translation, plus (+) and slash (/) are never discarded
* standard_ and urlsafe_b64decode() discard characters as well
Also update the doc strings to clarify data types, based on revision
92760d2edc9e, correct the exception raised by b16decode(), and correct the
parameter name for the base-85 functions.
Ned Deily [Tue, 23 Feb 2016 11:10:06 +0000 (22:10 +1100)]
Issue #26406: merge from 3.5
Ned Deily [Tue, 23 Feb 2016 11:05:29 +0000 (22:05 +1100)]
Issue #26406: Avoid unnecessary serialization of getaddrinfo(3) calls on
current versions of OpenBSD and NetBSD. Patch by A. Jesse Jiryu Davis.
Georg Brandl [Mon, 22 Feb 2016 13:53:03 +0000 (14:53 +0100)]
merge with 3.5
Georg Brandl [Mon, 22 Feb 2016 13:52:55 +0000 (14:52 +0100)]
Update example; str(float) changed so there is difference now.
Zachary Ware [Mon, 22 Feb 2016 10:16:33 +0000 (04:16 -0600)]
Issue #26268: Merge with 3.5
Martin Panter [Mon, 22 Feb 2016 10:10:55 +0000 (10:10 +0000)]
Issue #26261: Merge NamedTemporaryFile docs from 3.5
Martin Panter [Mon, 22 Feb 2016 10:10:00 +0000 (10:10 +0000)]
Issue #26261: Clarify NamedTemporaryFile name attribute vs file.name
Zachary Ware [Mon, 22 Feb 2016 10:08:51 +0000 (04:08 -0600)]
Issue #26268: Update Windows builds to use OpenSSL 1.0.2f
Zachary Ware [Mon, 22 Feb 2016 10:02:30 +0000 (04:02 -0600)]
Issue #26268: Update the prepare_ssl.py script
It can now handle OpenSSL versions 1.0.2e and greater, which don't
include include files in include/.
Note that sources prepared by this script no longer support the old
project files for 2.7; you now have to have Perl available to use
the old build_ssl.py script with sources from svn.python.org.
Martin Panter [Mon, 22 Feb 2016 09:21:49 +0000 (09:21 +0000)]
Issue #26390: Fix and test pbkdf2_hmac() parameter names
Based on patch by Daan Bakker.
Martin Panter [Mon, 22 Feb 2016 09:05:19 +0000 (09:05 +0000)]
Merge XML-RPC client documentation from 3.5
Martin Panter [Mon, 22 Feb 2016 09:04:22 +0000 (09:04 +0000)]
Fix errors in XML-RPC client example code
* http.client.HTTP (does not exist in Python 3) → HTTPConnection
* Server (deprecated) → ServerProxy
* Transport.send_request() grew a new “debug” parameter in Python 3 (revision
a528f7f8f97a)
Berker Peksag [Sun, 21 Feb 2016 20:00:29 +0000 (22:00 +0200)]
Issue #26401: Fix compile() documentation
After
25032ec29315, compile() will raise a ValueError
if source contains null bytes.
Patch by SilentGhost.