summaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2001-05-04 18:49:06 (GMT)
committerGuido van Rossum <guido@python.org>2001-05-04 18:49:06 (GMT)
commit648b4de3d31aab9df142540919accf0cb518e2f3 (patch)
tree28cd016e64f96bdb4e25636ff1834dcfeb601f05 /LICENSE
parent3e360db159a04bcff6ad1db4a1c09adae4d620b2 (diff)
downloadcpython-648b4de3d31aab9df142540919accf0cb518e2f3.zip
cpython-648b4de3d31aab9df142540919accf0cb518e2f3.tar.gz
cpython-648b4de3d31aab9df142540919accf0cb518e2f3.tar.bz2
Make the license GPL-compatible.
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE21
1 files changed, 5 insertions, 16 deletions
diff --git a/LICENSE b/LICENSE
index 465f691..366d3e4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -76,22 +76,11 @@ OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
6. This License Agreement will automatically terminate upon a material
breach of its terms and conditions.
-7. This License Agreement shall be governed by the federal
-intellectual property law of the United States, including without
-limitation the federal copyright law, and, to the extent such
-U.S. federal law does not apply, by the law of the Commonwealth of
-Virginia, excluding Virginia's conflict of law provisions.
-Notwithstanding the foregoing, with regard to derivative works based
-on Python 2.1 that incorporate non-separable material that was
-previously distributed under the GNU General Public License (GPL), the
-law of the Commonwealth of Virginia shall govern this License
-Agreement only as to issues arising under or with respect to
-Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this
-License Agreement shall be deemed to create any relationship of
-agency, partnership, or joint venture between PSF and Licensee. This
-License Agreement does not grant permission to use PSF trademarks or
-trade name in a trademark sense to endorse or promote products or
-services of Licensee, or any third party.
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between PSF and
+Licensee. This License Agreement does not grant permission to use PSF
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
8. By copying, installing or otherwise using Python 2.1, Licensee
agrees to be bound by the terms and conditions of this License