Changed licenses to the MIT License
This commit is contained in:
parent
ce7fc323c6
commit
a80639c7e2
2 changed files with 19 additions and 59 deletions
74
COPYING
74
COPYING
|
@ -1,61 +1,21 @@
|
|||
http://www.opensource.org/licenses/pythonpl.php
|
||||
The MIT License
|
||||
|
||||
IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.
|
||||
Copyright (c) 2009 Michael P. Soulier
|
||||
|
||||
BY CLICKING ON "ACCEPT" WHERE INDICATED BELOW, OR BY COPYING, INSTALLING OR
|
||||
OTHERWISE USING PYTHON 1.6, beta 1 SOFTWARE, YOU ARE DEEMED TO HAVE AGREED TO
|
||||
THE TERMS AND CONDITIONS OF THIS LICENSE AGREEMENT.
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
1. This LICENSE AGREEMENT is between the Corporation for National Research
|
||||
Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191
|
||||
("CNRI"), and the Individual or Organization ("Licensee") accessing and
|
||||
otherwise using Python 1.6, beta 1 software in source or binary form and its
|
||||
associated documentation, as released at the www.python.org Internet site on
|
||||
August 4, 2000 ("Python 1.6b1").
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
2. Subject to the terms and conditions of this License Agreement, CNRI hereby
|
||||
grants Licensee a non-exclusive, royalty-free, world-wide license to
|
||||
reproduce, analyze, test, perform and/or display publicly, prepare derivative
|
||||
works, distribute, and otherwise use Python 1.6b1 alone or in any derivative
|
||||
version, provided, however, that CNRIs License Agreement is retained in Python
|
||||
1.6b1, alone or in any derivative version prepared by Licensee.
|
||||
|
||||
Alternately, in lieu of CNRIs License Agreement, Licensee may substitute the
|
||||
following text (omitting the quotes): "Python 1.6, beta 1, is made available
|
||||
subject to the terms and conditions in CNRIs License Agreement. This Agreement
|
||||
may be located on the Internet using the following unique, persistent
|
||||
identifier (known as a handle): 1895.22/1011. This Agreement may also be
|
||||
obtained from a proxy server on the Internet using the
|
||||
URL:http://hdl.handle.net/1895.22/1011".
|
||||
|
||||
3. In the event Licensee prepares a derivative work that is based on or
|
||||
incorporates Python 1.6b1or any part thereof, and wants to make the derivative
|
||||
work available to the public as provided herein, then Licensee hereby agrees
|
||||
to indicate in any such work the nature of the modifications made to Python
|
||||
1.6b1.
|
||||
|
||||
4. CNRI is making Python 1.6b1 available to Licensee on an "AS IS" basis. CNRI
|
||||
MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE,
|
||||
BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY
|
||||
OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF
|
||||
PYTHON 1.6b1WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
|
||||
|
||||
5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE SOFTWARE FOR
|
||||
ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
|
||||
USING, MODIFYING OR DISTRIBUTING PYTHON 1.6b1, 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 and interpreted in all respects
|
||||
by the law of the State of Virginia, excluding conflict of law provisions.
|
||||
Nothing in this License Agreement shall be deemed to create any relationship
|
||||
of agency, partnership, or joint venture between CNRI and Licensee. This
|
||||
License Agreement does not grant permission to use CNRI trademarks or trade
|
||||
name in a trademark sense to endorse or promote products or services of
|
||||
Licensee, or any third party.
|
||||
|
||||
8. By clicking on the "ACCEPT" button where indicated, or by copying,
|
||||
installing or otherwise using Python 1.6b1, Licensee agrees to be bound by the
|
||||
terms and conditions of this License Agreement.
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
|
|
4
setup.py
4
setup.py
|
@ -3,7 +3,7 @@
|
|||
from distutils.core import setup
|
||||
|
||||
setup(name='tftpy',
|
||||
version='0.4.7-pre',
|
||||
version='0.5-pre',
|
||||
description='Python TFTP library',
|
||||
author='Michael P. Soulier',
|
||||
author_email='msoulier@digitaltorque.ca',
|
||||
|
@ -15,7 +15,7 @@ setup(name='tftpy',
|
|||
'Environment :: Console',
|
||||
'Environment :: No Input/Output (Daemon)',
|
||||
'Intended Audience :: Developers',
|
||||
'License :: OSI Approved :: Python License (CNRI Python License)',
|
||||
'License :: OSI-Approved Open Source :: MIT License',
|
||||
'Operating System :: OS Independent',
|
||||
'Topic :: Internet',
|
||||
]
|
||||
|
|
Reference in a new issue