Skip to content

Commit

Permalink
Copyright year update, add version to licenses.
Browse files Browse the repository at this point in the history
  • Loading branch information
birkenfeld committed Oct 4, 2014
1 parent e800a0e commit edc3cba
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Doc/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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:

----------------------------------------------------------------------
Copyright (c) 2000-2013 Python Software Foundation.
Copyright (c) 2000-2014 Python Software Foundation.
All rights reserved.

Copyright (c) 2000 BeOpen.com.
Expand Down
6 changes: 5 additions & 1 deletion Doc/license.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.5 | 3.2.4 | 2013 | PSF | yes |
+----------------+--------------+------------+------------+-----------------+
| 3.2.6 | 3.2.5 | 2014 | PSF | yes |
+----------------+--------------+------------+------------+-----------------+

.. note::

Expand Down Expand Up @@ -150,7 +154,7 @@ Terms and conditions for accessing or otherwise using Python
analyze, test, perform and/or display publicly, prepare derivative works,
distribute, and otherwise use Python |release| alone or in any derivative
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
prepared by Licensee.

Expand Down
4 changes: 3 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ the various releases.
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.2.5 3.2.4 2013 PSF yes
3.2.6 3.2.5 2014 PSF yes

Footnotes:

Expand Down Expand Up @@ -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,
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,
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.

3. In the event Licensee prepares a derivative work that is based on
Expand Down
2 changes: 1 addition & 1 deletion PC/python_nt.rc
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ BEGIN
VALUE "FileDescription", "Python Core\0"
VALUE "FileVersion", PYTHON_VERSION
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 "ProductName", "Python\0"
VALUE "ProductVersion", PYTHON_VERSION
Expand Down
2 changes: 1 addition & 1 deletion Python/getcopyright.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

static char cprt[] =
"\
Copyright (c) 2001-2013 Python Software Foundation.\n\
Copyright (c) 2001-2014 Python Software Foundation.\n\
All Rights Reserved.\n\
\n\
Copyright (c) 2000 BeOpen.com.\n\
Expand Down

0 comments on commit edc3cba

Please sign in to comment.