summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-01-01 17:29:49 +0000
committerBenjamin Peterson <benjamin@python.org>2009-01-01 17:29:49 +0000
commitd6baa70b96185e997674371958cd04a16aa83499 (patch)
treec00e27c86907bb7a06acfaf883026c2c52b32c90 /LICENSE
parent8ea999930c9af7226057de343fa38b8bf0f5aeb1 (diff)
downloadcpython-git-d6baa70b96185e997674371958cd04a16aa83499.tar.gz
welcome to 2009, Python!
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE17
1 files changed, 8 insertions, 9 deletions
diff --git a/LICENSE b/LICENSE
index 69acaeb753..0f72a618c4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -88,15 +88,14 @@ PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
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 Python Software Foundation;
-All Rights Reserved" are retained in Python alone or in any derivative
-version prepared by Licensee.
+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 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