[Python-checkins] cpython (3.3): Closes #19043: remove detailed listing of versions from license files
georg.brandl
python-checkins at python.org
Sun Sep 22 11:46:24 CEST 2013
http://hg.python.org/cpython/rev/59b6c3280827
changeset: 85776:59b6c3280827
branch: 3.3
parent: 85772:e8d4ed996447
user: Georg Brandl <georg at python.org>
date: Sun Sep 22 11:45:52 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
very new minor release.
files:
Doc/license.rst | 72 +------------------------------------
LICENSE | 40 +--------------------
2 files changed, 2 insertions(+), 110 deletions(-)
diff --git a/Doc/license.rst b/Doc/license.rst
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -50,81 +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.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 |
-+----------------+--------------+------------+------------+-----------------+
-| 3.0 | 2.6 | 2008 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.0.1 | 3.0 | 2009 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.1 | 3.0.1 | 2009 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.1.1 | 3.1 | 2009 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.1.2 | 3.1.1 | 2010 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.1.3 | 3.1.2 | 2010 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.1.4 | 3.1.3 | 2011 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.2 | 3.1 | 2011 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.2.1 | 3.2 | 2011 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.2.2 | 3.2.1 | 2011 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.2.3 | 3.2.2 | 2012 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.2.4 | 3.2.3 | 2013 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.3.0 | 3.2 | 2012 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.3.1 | 3.3.0 | 2013 | 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,47 +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
- 3.0 2.6 2008 PSF yes
- 3.0.1 3.0 2009 PSF yes
- 3.1 3.0.1 2009 PSF yes
- 3.1.1 3.1 2009 PSF yes
- 3.1.2 3.1.1 2010 PSF yes
- 3.1.3 3.1.2 2010 PSF yes
- 3.1.4 3.1.3 2011 PSF yes
- 3.2 3.1 2011 PSF yes
- 3.2.1 3.2 2011 PSF yes
- 3.2.2 3.2.1 2011 PSF yes
- 3.2.3 3.2.2 2012 PSF yes
- 3.2.4 3.2.3 2013 PSF yes
- 3.3.0 3.2 2012 PSF yes
- 3.3.1 3.3.0 2013 PSF yes
+ 2.2 and above 2.1.1 2001-now PSF yes
Footnotes:
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list