[Python-checkins] CVS: python/dist/src LICENSE,1.15,1.16

[Guido van Rossum]

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv19690

Modified Files:
	LICENSE 
Log Message:
Make the license GPL-compatible.


Index: LICENSE
===================================================================
RCS file: /cvsroot/python/python/dist/src/LICENSE,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** LICENSE	2001/04/13 19:41:28	1.15
--- LICENSE	2001/05/04 18:49:06	1.16
***************
*** 77,96 ****
  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.
  
  8. By copying, installing or otherwise using Python 2.1, Licensee
--- 77,85 ----
  breach of its terms and conditions.
  
! 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