Commit Graph

93498 Commits

Author SHA1 Message Date
Serhiy Storchaka bb0dbd583b 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.
2016-03-01 10:25:45 +02:00
Terry Jan Reedy 8131f14de9 Merge with 3.5 2016-03-01 01:19:02 -05:00
Terry Jan Reedy 5f582bdec8 Whitespace 2016-03-01 01:18:47 -05:00
Terry Jan Reedy 54f99500dd Merge with 3.5 2016-03-01 01:13:21 -05:00
Terry Jan Reedy 7811a9cf3e Document maintenance of idlelib/help.html in idlelib. 2016-03-01 01:13:07 -05:00
Terry Jan Reedy 13d09afff1 Merge with 3.5 2016-03-01 00:30:20 -05:00
Terry Jan Reedy f8cd02dcda 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.
2016-03-01 00:29:57 -05:00
Martin Panter 93088d1b03 Issue #26385: Merge NamedTemporaryFile fix from 3.5 2016-02-29 11:25:09 +00:00
Georg Brandl d047c2f8b2 merge with 3.5 2016-02-28 21:13:44 +01:00
Georg Brandl 96421d6f11 Update susp-ignore file (#25910). 2016-02-28 21:13:23 +01:00
Georg Brandl a7f7232838 merge with 3.5 2016-02-28 21:09:45 +01:00
Georg Brandl 76b2ee03c3 Fix typo. 2016-02-28 21:09:36 +01:00
Martin Panter 7869a22779 Issue #26385: Cleanup NamedTemporaryFile if open() fails, by SilentGhost 2016-02-28 05:22:20 +00:00
Martin Panter 8cacc63002 Issue #22836: Merge exception reporting from 3.5 2016-02-28 03:29:51 +00:00
Martin Panter 3263f6874a Issue #22836: Keep exception reports sensible despite errors 2016-02-28 03:16:11 +00:00
Ezio Melotti b8d75035f2 #26246: merge with 3.5. 2016-02-27 08:42:14 +02:00
Ezio Melotti 738f88f688 #26246: merge with 3.4. 2016-02-27 08:41:16 +02:00
Ezio Melotti 90ba2ca68a #26246: update copybutton.js after JQuery update. Patch by Liang-Bo Wang. 2016-02-27 08:39:36 +02:00
Victor Stinner fc6f2efd13 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
2016-02-27 02:19:22 +01:00
Georg Brandl 3902d62c4e merge with 3.5 2016-02-26 19:37:52 +01:00
Georg Brandl 5d94134040 Closes #25910: fix dead and permanently redirected links in the docs. Thanks to SilentGhost for the patch. 2016-02-26 19:37:12 +01:00
Georg Brandl 1a41c44af9 merge with 3.5 2016-02-26 19:18:05 +01:00
Georg Brandl 06871ef2b3 Fix version. 2016-02-26 19:17:39 +01:00
Georg Brandl eb73563f48 merge with 3.5 2016-02-26 19:16:43 +01:00
Georg Brandl 32fbd3a623 Closes #26442: fix copy-paste. 2016-02-26 19:16:40 +01:00
Georg Brandl def4ff6a64 merge with 3.5 2016-02-26 19:14:56 +01:00
Georg Brandl adeffcc2f9 Closes #26444: typo fixes. 2016-02-26 19:13:47 +01:00
Benjamin Peterson 9d66d4af06 remove unused c_encoding struct member 2016-02-25 23:25:14 -08:00
Benjamin Peterson 768921cf33 rewrite parsestr() so it's comprehensible; remove dead code 2016-02-25 23:13:53 -08:00
Benjamin Peterson 202803a0c0 c_encoding can never be NULL, which allows some code simplification 2016-02-25 22:34:45 -08:00
Martin Panter 7812dbccf0 Dummy merge with 3.5 2016-02-26 00:42:33 +00:00
Martin Panter de9b27d908 Issue #26390: Merge pbkdf2_hmac() doc from 3.5 2016-02-26 00:41:38 +00:00
Georg Brandl 6d6dd73aec merge with 3.5 2016-02-25 20:18:00 +01:00
Georg Brandl 8c16cb9f65 Closes #26435: fix syntax in directives. Thanks to Jakub Stasiak. 2016-02-25 20:17:45 +01:00
Georg Brandl 057ab49a6b merge with 3.5 2016-02-25 20:14:21 +01:00
Georg Brandl 2305b3cde3 Fix rstlint to also look for indented comments that should be directives. 2016-02-25 20:14:10 +01:00
Martin Panter 6e132254a9 Issue #26402: Merge XML-RPC client fix from 3.5 2016-02-25 12:13:50 +00:00
Martin Panter eae3336e42 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.
2016-02-25 11:53:40 +00:00
Serhiy Storchaka f799ca82a0 Issue #25801: Fixed resource warnings in test_zipfile64.
Patch by SilentGhost.
2016-02-25 13:16:02 +02:00
Serhiy Storchaka f828218d65 Issue #25801: Fixed resource warnings in test_zipfile64.
Patch by SilentGhost.
2016-02-25 12:55:19 +02:00
Raymond Hettinger 62bc321819 Fix out-of-date comment 2016-02-25 00:25:45 -08:00
Ned Deily 3ece994f9d Issue #25136: merge from 3.5 2016-02-25 01:35:21 +11:00
Ned Deily e76a6d56d2 Issue #25136: Add reference to 'xcode-select --install' to Mac README. 2016-02-25 01:34:34 +11:00
Ned Deily 5c884dfc57 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.
2016-02-25 01:03:06 +11:00
Ned Deily 59884989f7 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.
2016-02-25 01:01:48 +11:00
Ned Deily b8da1a4fee Issue #25136: merge from 3.5 2016-02-25 00:59:16 +11:00
Ned Deily 020250f91f 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.
2016-02-25 00:56:38 +11:00
Jason R. Coombs b118870490 Issue #26302: merge from 3.5 2016-02-24 08:50:59 -05:00
Serhiy Storchaka d10aa2e30d Null merge 2016-02-24 13:04:33 +02:00
Serhiy Storchaka e14c07e4e4 Fixed a bug in os.walk() with bytes path on Windows caused by merging fixes
for issues #25995 and #25911.
2016-02-24 13:03:54 +02:00