Skip to content

2.7 #3455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3,500 commits into from
Closed

2.7 #3455

wants to merge 3,500 commits into from

Conversation

patilsharan
Copy link

!!! If this is a backport PR (PR made against branches other than master),
please ensure that the PR title is in the following format:

[X.Y] <title from the original PR> GH-NNNN

Where: [X.Y] is the branch name, for example [3.6]

GH-NNNN refers to the PR number from master.

PLEASE: Remove this headline!!!

ncoghlan and others added 30 commits April 9, 2017 20:57
The reference to administrative data was confusing to readers,
so this simplifies the note to explain that deep copying may copy
more then you intended, such as data that you expected to be
shared between copies.

Patch by Sanyam Khurana.
And fix the parameter name.

(cherry picked from commit 8fc7bc2)
* Remove conditional on free of `dps`, since `dps` is now allocated for
all versions of OpenSSL
* Remove call to `x509_check_ca` since it was only used to cache
the `crldp` field of the certificate
CRL_DIST_POINTS_free is available in all supported versions of OpenSSL
(recent 0.9.8+) and LibreSSL.
(cherry picked from commit 2849cc3)
…_Size() (GH-1096) (GH-1180) (#1183)

raised an error.

(cherry picked from commit bf623ae)
(cherry picked from commit 680fea4)
…the parser module. (GH-1131). (GH-1185) (#1189)

(cherry picked from commit a79f4c2).
(cherry picked from commit 952a05e)
Reported by Sean Canavan on [email protected].

(cherry picked from commit 8526fb7)
Ignore more generated files.
Backport enhancements from master, commits:

* 9c4bfa6: "make tags": remove -t
  option of ctags. The option was kept for backward compatibility,
  but it was completly removed recently. Patch written by Stéphane
  Wirtel.
* cf0ac6a: Fix "make tags": set
  locale to C to call sort
* 8a543c0: `make tags` fixes (GH-717)
To simplify backports from Python 3, the test.test_support module
was converted into a package and renamed to test.support.  The
test.script_helper module was moved into the test.support package.
Names test.test_support and test.script_helper are left as aliases to
test.support and test.support.script_helper.
Based on commit 5c4b0d0 by Ned
Deily, which is based on original patches by Brett Cannon and Steve
Dower.

Remove also the private _Py_svnversion() function and SVNVERSION
variable.

Note: Py_SubversionRevision() and Py_SubversionShortBranch() are
unchanged, they are part of the public API.
To unify running tests in Python 2.7 and Python 3, the test
package can be run as a script.  This is equivalent to running the
test.regrtest module as a script.
Use --short form of git hash.  Use output from "git describe" for tag.

Expected outputs:
1. previous hg
2. previous git
3. updated git

Release (tagged) build:
1. Python 3.7.0a0 (v3.7.0a0:4def2a2901a5, ...
2. Python 3.7.0a0 (v3.7.0a0^0:05f53735c8912f8df1077e897f052571e13c3496, ...
3. Python 3.7.0a0 (v3.7.0a0:05f53735c8, ...

Development build:
1. Python 3.7.0a0 (default:41df79263a11, ...
2. Python 3.7.0a0 (master:05f53735c8912f8df1077e897f052571e13c3496, ...
3. Python 3.7.0a0 (heads/master-dirty:05f53735c8, ...

"dirty" means the working tree has uncommitted changes.
See "git help describe" for more info.
(cherry picked from commit 554626a)
(cherry picked from commit ed512cb)
zware and others added 15 commits September 5, 2017 13:02
* bpo-31339: Rewrite time.asctime() and time.ctime()

Backport and adapt the _asctime() function from the master branch to
not depend on the implementation of asctime() and ctime() from the
external C library. This change fixes a bug when Python is run using
the musl C library.

* bound checks for time.asctime()

* bound checks for time.strftime()
Fix copying of partial characters for UTF-8 input (libexpat bug 115):
libexpat/libexpat#115

(cherry picked from commit 759e30e)

The standard header stdbool.h is not available
with old Visual Studio compilers

Cherry-picked from libexpat b4b89c2ab0cc5325a41360c25ef9d2ccbe617e5c.

expat: Add artificial scopes in xmltok.c utf8_toUtf8() to fix c89 compilation.

Cherry-picked from libexpat commit e0b290eb3d8f4c4b45137a7d7f4f8db812145bd2
…3371)

This also eliminats a dead link to Weave in the process..
(cherry picked from commit 78ffd6c)
Signed-off-by: Christian Heimes <[email protected]>.
(cherry picked from commit d3b9f97)
…behavior. (#2705)

See also 1f29cef.  The configure.ac change was omitted from the earlier change...
… newlines. (GH-3272) (GH-3428)

Also provide a solution if the user wants to keep multiple blank lines.
(cherry picked from commit 397c467)
Signed-off-by: Christian Heimes <[email protected]>
(cherry picked from commit 17c9ac9)
#3446)

* bpo-29136: Add TLS 1.3 support

TLS 1.3 introduces a new, distinct set of cipher suites. The TLS 1.3
cipher suites don't overlap with cipher suites from TLS 1.2 and earlier.
Since Python sets its own set of permitted ciphers, TLS 1.3 handshake
will fail as soon as OpenSSL 1.1.1 is released. Let's enable the common
AES-GCM and ChaCha20 suites.

Additionally the flag OP_NO_TLSv1_3 is added. It defaults to 0 (no op) with
OpenSSL prior to 1.1.1. This allows applications to opt-out from TLS 1.3
now.

Signed-off-by: Christian Heimes <[email protected]>.
(cherry picked from commit cb5b68a)
@patilsharan patilsharan requested a review from a team September 8, 2017 08:51
@patilsharan patilsharan requested a review from a team as a code owner September 8, 2017 08:51
@the-knights-who-say-ni
Copy link

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept your contribution by verifying you have signed the PSF contributor agreement (CLA).

Unfortunately we couldn't find an account corresponding to your GitHub username on bugs.python.org (b.p.o) to verify you have signed the CLA (this might be simply due to a missing "GitHub Name" entry in your b.p.o account settings). This is necessary for legal reasons before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

Thanks again to your contribution and we look forward to looking at it!

@skrah
Copy link
Contributor

skrah commented Sep 8, 2017

This is the second massive nonsense PR within 24 hours.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.