Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 028d069

Browse files
gvanrossumgvanrossum
committed
Various edits. Most importantly, added dual licensing. Also some
changes suggested by BobW.
1 parent 1fa0b89 commit 028d069

1 file changed

Lines changed: 41 additions & 34 deletions

File tree

‎LICENSE‎

Lines changed: 41 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,65 +4,73 @@ HISTORY OF THE SOFTWARE
44
Python was created in the early 1990s by Guido van Rossum at Stichting
55
Mathematisch Centrum (CWI) in the Netherlands as a successor of a
66
language called ABC. Guido is Python's principal author, although it
7-
includes many contributions by others. The last version released from
8-
CWI was Python 1.2. In 1995, Guido continued his work on Python at
9-
the Corporation for National Research Initiatives (CNRI) in Reston,
7+
includes many contributions from others. The last version released
8+
from CWI was Python 1.2. In 1995, Guido continued his work on Python
9+
at the Corporation for National Research Initiatives (CNRI) in Reston,
1010
Virginia where he released several versions of the software. Python
1111
1.6 was the last of the versions released by CNRI. In 2000, Guido and
12-
the Python core developement team moved to BeOpen.com to form tbe
13-
BeOpen PythonLabs group. Python 2.0 is a derivative work of Python
14-
1.6, developed by PythonLabs and many outside volunteers, under
15-
Guido's direction.
12+
the Python core developement team moved to BeOpen.com to form the
13+
BeOpen PythonLabs team (www.pythonlabs.com). Python 2.0 is the first
14+
release from PythonLabs. Thanks to the many outside volunteers who
15+
have worked under Guido's direction to make this release possible.
1616

1717

18-
TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON 2.0
19-
================================================================
2018

21-
BEOPEN LICENSE AGREEMENT
22-
------------------------
19+
BEOPEN.COM TERMS AND CONDITIONS FOR PYTHON 2.0
20+
==============================================
21+
22+
BEOPEN PYTHON LICENSE AGREEMENT
23+
-------------------------------
2324

2425
BEOPEN OPEN SOURCE LICENSE AGREEMENT
2526

26-
1. This LICENSE AGREEMENT is between BeOpen.com, having an office at
27-
160 Saratoga Avenue, Santa Clara, CA 95051 ("BeOpen"), and the
27+
1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
28+
office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
2829
Individual or Organization ("Licensee") accessing and otherwise using
2930
this software in source or binary form and its associated
3031
documentation ("the Software").
3132

32-
2. Subject to the terms and conditions of this License Agreement,
33-
BeOpen hereby grants Licensee a non-exclusive, royalty-free,
34-
world-wide license to reproduce, analyze, test, perform and/or display
35-
publicly, prepare derivative works, distribute, and otherwise use the
36-
Software alone or in any derivative version, provided, however, that
37-
BeOpen's License Agreement is retained in the Software, alone or in
38-
any derivative version prepared by Licensee.
39-
40-
3. BeOpen is making the Software available to Licensee on an "AS IS"
33+
2. Subject to the terms and conditions of this BeOpen Python License
34+
Agreement, BeOpen hereby grants Licensee a non-exclusive,
35+
royalty-free, world-wide license to reproduce, analyze, test, perform
36+
and/or display publicly, prepare derivative works, distribute, and
37+
otherwise use the Software alone or in any derivative version,
38+
provided, however, that the BeOpen Python License is retained in the
39+
Software, alone or in any derivative version prepared by Licensee.
40+
41+
3. Instead of using this License, you can redistribute and/or modify
42+
the Software under the terms of the GNU General Public License as
43+
published by the Free Software Foundation; either version 2, or (at
44+
your option) any later version. For a copy of the GPL, see
45+
http://www.gnu.org/copyleft/gpl.html.
46+
47+
4. BeOpen is making the Software available to Licensee on an "AS IS"
4148
basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
4249
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
4350
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
4451
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
4552
INFRINGE ANY THIRD PARTY RIGHTS.
4653

47-
4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
54+
5. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
4855
SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
4956
AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
5057
DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
5158

52-
5. This License Agreement will automatically terminate upon a material
59+
6. This License Agreement will automatically terminate upon a material
5360
breach of its terms and conditions.
5461

55-
6. This License Agreement shall be governed by and interpreted in all
62+
7. This License Agreement shall be governed by and interpreted in all
5663
respects by the law of the State of California, excluding conflict of
5764
law provisions. Nothing in this License Agreement shall be deemed to
5865
create any relationship of agency, partnership, or joint venture
5966
between BeOpen and Licensee. This License Agreement does not grant
6067
permission to use BeOpen trademarks or trade name in a trademark sense
6168
to endorse or promote products or services of Licensee, or any third
62-
party. The "BeOpen Python" logos may be downloaded and used according
63-
to the permissions granted on the logo download page.
69+
party. As an exception, the "BeOpen Python" logos available at
70+
http://www.pythonlabs.com/logos.html may be used according to the
71+
permissions granted on that web page.
6472

65-
7. By copying, installing or otherwise using the software, Licensee
73+
8. By copying, installing or otherwise using the software, Licensee
6674
agrees to be bound by the terms and conditions of this License
6775
Agreement.
6876

@@ -71,12 +79,11 @@ CNRI LICENSE AGREEMENT
7179
----------------------
7280

7381
Python 1.6 is made available subject to the terms and conditions in
74-
CNRI's License Agreement. This Agreement may be located on the
75-
Internet using the following unique, persistent identifier (known as a
76-
handle): 1895.22/1011. This Agreement may also be obtained from a
77-
proxy server on the Internet using the
78-
URL:http://hdl.handle.net/1895.22/1011"
79-
82+
CNRI's License Agreement. This Agreement together with Python 1.6 may
83+
be located on the Internet using the following unique, persistent
84+
identifier (known as a handle): 1895.22/1012. This Agreement may also
85+
be obtained from a proxy server on the Internet using the following
86+
URL: http://hdl.handle.net/1895.22/1012.
8087

8188

8289
CWI PERMISSIONS STATEMENT AND DISCLAIMER

0 commit comments

Comments
 (0)