*** LICENSE-PYTHON-2.x Mon Jul 05 15:44:12 2010
--- PSF-LICENSE-v3 Mon Jul 05 17:22:21 2010
***************
*** 1,47 ****
! PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
  --------------------------------------------
  
! 1. This LICENSE AGREEMENT is between the Python Software Foundation
! ("PSF"), and the Individual or Organization ("Licensee") accessing and
! otherwise using this software ("Python") in source or binary form and
! its associated documentation.
  
! 2. Subject to the terms and conditions of this License Agreement, PSF hereby
! grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
! analyze, test, perform and/or display publicly, prepare derivative works,
! distribute, and otherwise use Python alone or in any derivative version,
! provided, however, that PSF's License Agreement and PSF's notice of copyright,
! i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
! Python Software Foundation; All Rights Reserved" are retained in Python alone or
! in any derivative version prepared by Licensee.
  
! 3. In the event Licensee prepares a derivative work that is based on
! or incorporates Python or any part thereof, and wants to make
! the derivative work available to others as provided herein, then
! Licensee hereby agrees to include in any such work a brief summary of
  the changes made to Python.
  
! 4. PSF is making Python available to Licensee on an "AS IS"
! basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
! IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
! DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
! FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
! INFRINGE ANY THIRD PARTY RIGHTS.
  
! 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
! FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
! A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
! 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. 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, Licensee
! agrees to be bound by the terms and conditions of this License
! Agreement.
--- 1,24 ----
! PYTHON SOFTWARE FOUNDATION LICENSE VERSION 3
  --------------------------------------------
  
! Copyright (c) 2001-2010, Python Software Foundation
  
! Permission to use, copy, modify, and/or distribute this software ("Python")
! for any purpose with or without fee is hereby granted, provided that the
! above copyright notice and this permission notice appear in all copies
! and the following conditions are met:
  
!    * Redistributions of derivative works should include a brief summary of
  the changes made to Python.
  
!    * Neither the name of Python Software Foundation nor the names of its
! contributors may be used to endorse or promote products derived from
! this software without specific prior written permission.
  
! PYTHON IS PROVIDED "AS IS" AND PSF DISCLAIMS ALL WARRANTIES
! WITH REGARD TO PYTHON INCLUDING ALL IMPLIED WARRANTIES OF
! MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL PSF BE LIABLE FOR
! ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
! WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
! ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
! OR IN CONNECTION WITH THE USE OR PERFORMANCE OF PYTHON.