[Python-checkins] cpython (2.7): Closes #19043: remove detailed listing of versions from license files

georg.brandl python-checkins at python.org
Sun Sep 22 11:44:35 CEST 2013

• Previous message: [Python-checkins] cpython (2.7): Closes #19061: make shelve security warning consistent between 2.x and 3.x.
• Next message: [Python-checkins] cpython (3.3): Closes #19043: remove detailed listing of versions from license files
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

http://hg.python.org/cpython/rev/7a8616f21f26
changeset: 85775:7a8616f21f26
branch: 2.7
user: Georg Brandl <georg at python.org>
date: Sun Sep 22 11:45:02 2013 +0200
summary:
 Closes #19043: remove detailed listing of versions from license files
Since all versions since 2.2 are under the same licensing terms,
this saves the release manager from touching the two files for
every new minor release.
files:
 Doc/license.rst | 50 +------------------------------------
 LICENSE | 27 +-------------------
 2 files changed, 2 insertions(+), 75 deletions(-)
diff --git a/Doc/license.rst b/Doc/license.rst
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -50,59 +50,11 @@
 +----------------+--------------+-----------+------------+-----------------+
 | 2.1.1 | 2.1+2.0.1 | 2001 | PSF | yes |
 +----------------+--------------+-----------+------------+-----------------+
-| 2.2 | 2.1.1 | 2001 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
 | 2.1.2 | 2.1.1 | 2002 | PSF | yes |
 +----------------+--------------+-----------+------------+-----------------+
 | 2.1.3 | 2.1.2 | 2002 | PSF | yes |
 +----------------+--------------+-----------+------------+-----------------+
-| 2.2.1 | 2.2 | 2002 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.2.2 | 2.2.1 | 2002 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.2.3 | 2.2.2 | 2002-2003 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.3 | 2.2.2 | 2002-2003 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.3.1 | 2.3 | 2002-2003 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.3.2 | 2.3.1 | 2003 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.3.3 | 2.3.2 | 2003 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.3.4 | 2.3.3 | 2004 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.3.5 | 2.3.4 | 2005 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.4 | 2.3 | 2004 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.4.1 | 2.4 | 2005 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.4.2 | 2.4.1 | 2005 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.4.3 | 2.4.2 | 2006 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.4.4 | 2.4.3 | 2006 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.5 | 2.4 | 2006 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.5.1 | 2.5 | 2007 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.5.2 | 2.5.1 | 2008 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.5.3 | 2.5.2 | 2008 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.6 | 2.5 | 2008 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.6.1 | 2.6 | 2008 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.6.2 | 2.6.1 | 2009 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.6.3 | 2.6.2 | 2009 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.6.4 | 2.6.3 | 2010 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.7 | 2.6 | 2010 | PSF | yes |
+| 2.2 and above | 2.1.1 | 2001-now | PSF | yes |
 +----------------+--------------+-----------+------------+-----------------+
 
 .. note::
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -36,34 +36,9 @@
 2.1 2.0+1.6.1 2001 PSF no
 2.0.1 2.0+1.6.1 2001 PSF yes
 2.1.1 2.1+2.0.1 2001 PSF yes
- 2.2 2.1.1 2001 PSF yes
 2.1.2 2.1.1 2002 PSF yes
 2.1.3 2.1.2 2002 PSF yes
- 2.2.1 2.2 2002 PSF yes
- 2.2.2 2.2.1 2002 PSF yes
- 2.2.3 2.2.2 2003 PSF yes
- 2.3 2.2.2 2002-2003 PSF yes
- 2.3.1 2.3 2002-2003 PSF yes
- 2.3.2 2.3.1 2002-2003 PSF yes
- 2.3.3 2.3.2 2002-2003 PSF yes
- 2.3.4 2.3.3 2004 PSF yes
- 2.3.5 2.3.4 2005 PSF yes
- 2.4 2.3 2004 PSF yes
- 2.4.1 2.4 2005 PSF yes
- 2.4.2 2.4.1 2005 PSF yes
- 2.4.3 2.4.2 2006 PSF yes
- 2.4.4 2.4.3 2006 PSF yes
- 2.5 2.4 2006 PSF yes
- 2.5.1 2.5 2007 PSF yes
- 2.5.2 2.5.1 2008 PSF yes
- 2.5.3 2.5.2 2008 PSF yes
- 2.6 2.5 2008 PSF yes
- 2.6.1 2.6 2008 PSF yes
- 2.6.2 2.6.1 2009 PSF yes
- 2.6.3 2.6.2 2009 PSF yes
- 2.6.4 2.6.3 2009 PSF yes
- 2.6.5 2.6.4 2010 PSF yes
- 2.7 2.6 2010 PSF yes
+ 2.2 and above 2.1.1 2001-now PSF yes
 
 Footnotes:
 
-- 
Repository URL: http://hg.python.org/cpython

---

• Previous message: [Python-checkins] cpython (2.7): Closes #19061: make shelve security warning consistent between 2.x and 3.x.
• Next message: [Python-checkins] cpython (3.3): Closes #19043: remove detailed listing of versions from license files
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

More information about the Python-checkins mailing list