gh-126022: make license.rst consistent with LICENSE #128516
Conversation
There was a problem hiding this comment.
I have manually reviewed that all the changes in this PR now reflect the text of LICENSE. (I haven't done the opposite, but Hugo already did that).
Therefore IMO it's ready to be merged. @hugovk if you agree, just merge it! Then for the parent issue we can just apply whatever we decide to do about Zope to both files.
| @@ -205,7 +208,7 @@ CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 | |||
| Agreement. This Agreement together with Python 1.6.1 may be located on the | |||
| internet using the following unique, persistent identifier (known as a handle): | |||
| 1895.22/1013. This Agreement may also be obtained from a proxy server on the | |||
| internet using the following URL: http://hdl.handle.net/1895.22/1013." | |||
| internet using the following URL: http://hdl.handle.net/1895.22/1013". | |||
There was a problem hiding this comment.
[sic] -- the missing quote is also missing in LICENSE. :-)
|
Thanks all, let's merge! |
hugovk
added
awaiting merge
needs backport to 3.12
|
Sorry, @partev and @hugovk, I could not cleanly backport this to |
|
Sorry, @partev and @hugovk, I could not cleanly backport this to |
…honGH-128516) (cherry picked from commit 9682a88) Co-authored-by: partev <[email protected]>
|
GH-129290 is a backport of this pull request to the 3.13 branch. |
| ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON DOCUMENTATION | ||
| ---------------------------------------------------------------------- |
There was a problem hiding this comment.
I'll include this in the backports and do a quick followup to fix this in main :)
| ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON DOCUMENTATION | |
| ---------------------------------------------------------------------- | |
| ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON DOCUMENTATION | |
| ------------------------------------------------------------ |
|
GH-129291 is a backport of this pull request to the 3.12 branch. |
…honGH-128516) (cherry picked from commit 9682a88) Co-authored-by: partev <[email protected]>
#129290) Co-authored-by: partev <[email protected]>
#129291) Co-authored-by: partev <[email protected]>
following on @gvanrossum 's advice I made license.rst consistent with LICENSE file.
📚 Documentation preview 📚: https://cpython-previews--128516.org.readthedocs.build/