Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Copyright year update, add version to licenses.

This commit is contained in:
Georg Brandl 2014-10-04 14:16:59 +02:00
parent e800a0e1c2
commit edc3cbaaba
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/README.txt
View File

@ -135,7 +135,7 @@ The Python source is copyrighted, but you can freely use and copy it
as long as you don't change or remove the copyright notice: as long as you don't change or remove the copyright notice:
---------------------------------------------------------------------- ----------------------------------------------------------------------
Copyright (c) 2000-2013 Python Software Foundation. Copyright (c) 2000-2014 Python Software Foundation.
All rights reserved. All rights reserved.
Copyright (c) 2000 BeOpen.com. Copyright (c) 2000 BeOpen.com.

6
Doc/license.rst
View File

@ -122,6 +122,10 @@ been GPL-compatible; the table below summarizes the various releases.
+----------------+--------------+------------+------------+-----------------+ +----------------+--------------+------------+------------+-----------------+
| 3.2.4 | 3.2.3 | 2013 | PSF | yes | | 3.2.4 | 3.2.3 | 2013 | PSF | yes |
+----------------+--------------+------------+------------+-----------------+ +----------------+--------------+------------+------------+-----------------+
| 3.2.5 | 3.2.4 | 2013 | PSF | yes |
+----------------+--------------+------------+------------+-----------------+
| 3.2.6 | 3.2.5 | 2014 | PSF | yes |
+----------------+--------------+------------+------------+-----------------+
.. note:: .. note::
@ -150,7 +154,7 @@ Terms and conditions for accessing or otherwise using Python
analyze, test, perform and/or display publicly, prepare derivative works, analyze, test, perform and/or display publicly, prepare derivative works,
distribute, and otherwise use Python |release| alone or in any derivative distribute, and otherwise use Python |release| alone or in any derivative
version, provided, however, that PSF's License Agreement and PSF's notice of version, provided, however, that PSF's License Agreement and PSF's notice of
copyright, i.e., "Copyright © 2001-2013 Python Software Foundation; All Rights copyright, i.e., "Copyright © 2001-2014 Python Software Foundation; All Rights
Reserved" are retained in Python |release| alone or in any derivative version Reserved" are retained in Python |release| alone or in any derivative version
prepared by Licensee. prepared by Licensee.

4
LICENSE
View File

@ -75,6 +75,8 @@ the various releases.
3.2.2 3.2.1 2011 PSF yes 3.2.2 3.2.1 2011 PSF yes
3.2.3 3.2.2 2012 PSF yes 3.2.3 3.2.2 2012 PSF yes
3.2.4 3.2.3 2013 PSF yes 3.2.4 3.2.3 2013 PSF yes
3.2.5 3.2.4 2013 PSF yes
3.2.6 3.2.5 2014 PSF yes
Footnotes: Footnotes:
@ -110,7 +112,7 @@ analyze, test, perform and/or display publicly, prepare derivative works,
distribute, and otherwise use Python alone or in any derivative version, distribute, and otherwise use Python alone or in any derivative version,
provided, however, that PSF's License Agreement and PSF's notice of copyright, 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, 2010, i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
2011, 2012, 2013 Python Software Foundation; All Rights Reserved" are retained 2011, 2012, 2013, 2014 Python Software Foundation; All Rights Reserved" are retained
in Python alone or in any derivative version prepared by Licensee. in Python alone or in any derivative version prepared by Licensee.
3. In the event Licensee prepares a derivative work that is based on 3. In the event Licensee prepares a derivative work that is based on

2
PC/python_nt.rc
View File

@ -61,7 +61,7 @@ BEGIN
VALUE "FileDescription", "Python Core\0" VALUE "FileDescription", "Python Core\0"
VALUE "FileVersion", PYTHON_VERSION VALUE "FileVersion", PYTHON_VERSION
VALUE "InternalName", "Python DLL\0" VALUE "InternalName", "Python DLL\0"
VALUE "LegalCopyright", "Copyright © 2001-2013 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0" VALUE "LegalCopyright", "Copyright © 2001-2014 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0"
VALUE "OriginalFilename", PYTHON_DLL_NAME "\0" VALUE "OriginalFilename", PYTHON_DLL_NAME "\0"
VALUE "ProductName", "Python\0" VALUE "ProductName", "Python\0"
VALUE "ProductVersion", PYTHON_VERSION VALUE "ProductVersion", PYTHON_VERSION

2
Python/getcopyright.c
View File

@ -4,7 +4,7 @@
static char cprt[] = static char cprt[] =
"\ "\
Copyright (c) 2001-2013 Python Software Foundation.\n\ Copyright (c) 2001-2014 Python Software Foundation.\n\
All Rights Reserved.\n\ All Rights Reserved.\n\
\n\ \n\
Copyright (c) 2000 BeOpen.com.\n\ Copyright (c) 2000 BeOpen.com.\n\