summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-01-01 00:09:36 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-01-01 00:09:36 (GMT)
commit47e782a67a79e7d4fdc4536c6d6935c0e3b45705 (patch)
tree98481d9566198f2f9cfec42ba78eee2389b8920c
parent44e4b98ff00c3f874989350d9767bd91ddeb39e4 (diff)
downloadcpython-47e782a67a79e7d4fdc4536c6d6935c0e3b45705.zip
cpython-47e782a67a79e7d4fdc4536c6d6935c0e3b45705.tar.gz
cpython-47e782a67a79e7d4fdc4536c6d6935c0e3b45705.tar.bz2
update for copyright for 2015
-rw-r--r--Doc/copyright.rst2
-rw-r--r--Doc/license.rst2
-rw-r--r--LICENSE4
-rw-r--r--PC/python_nt.rc2
-rw-r--r--Python/getcopyright.c2
-rw-r--r--README2
6 files changed, 7 insertions, 7 deletions
diff --git a/Doc/copyright.rst b/Doc/copyright.rst
index 94f777c..2b2f887 100644
--- a/Doc/copyright.rst
+++ b/Doc/copyright.rst
@@ -4,7 +4,7 @@ Copyright
Python and this documentation is:
-Copyright © 2001-2013 Python Software Foundation. All rights reserved.
+Copyright © 2001-2015 Python Software Foundation. All rights reserved.
Copyright © 2000 BeOpen.com. All rights reserved.
diff --git a/Doc/license.rst b/Doc/license.rst
index 32a36b9..1c69cf6 100644
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -154,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-2014 Python Software Foundation; All Rights
+ copyright, i.e., "Copyright © 2001-2015 Python Software Foundation; All Rights
Reserved" are retained in Python |release| alone or in any derivative version
prepared by Licensee.
diff --git a/LICENSE b/LICENSE
index 3fdc973..0d08c88 100644
--- a/LICENSE
+++ b/LICENSE
@@ -112,8 +112,8 @@ 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, 2014 Python Software Foundation; All Rights Reserved" are retained
-in Python alone or in any derivative version prepared by Licensee.
+2011, 2012, 2013, 2014, 2015 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
diff --git a/PC/python_nt.rc b/PC/python_nt.rc
index 3f55723..ae16097 100644
--- a/PC/python_nt.rc
+++ b/PC/python_nt.rc
@@ -61,7 +61,7 @@ BEGIN
VALUE "FileDescription", "Python Core\0"
VALUE "FileVersion", PYTHON_VERSION
VALUE "InternalName", "Python DLL\0"
- VALUE "LegalCopyright", "Copyright © 2001-2014 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0"
+ VALUE "LegalCopyright", "Copyright © 2001-2015 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
diff --git a/Python/getcopyright.c b/Python/getcopyright.c
index d9da116..ba66474 100644
--- a/Python/getcopyright.c
+++ b/Python/getcopyright.c
@@ -4,7 +4,7 @@
static char cprt[] =
"\
-Copyright (c) 2001-2014 Python Software Foundation.\n\
+Copyright (c) 2001-2015 Python Software Foundation.\n\
All Rights Reserved.\n\
\n\
Copyright (c) 2000 BeOpen.com.\n\
diff --git a/README b/README
index 7ecd6d1..252f63f 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ This is Python version 3.2.6
============================
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-2012, 2013, 2014 Python Software Foundation. All rights reserved.
+2012, 2013, 2014, 2015 Python Software Foundation. All rights reserved.
Python 3.x is a new version of the language, which is incompatible with the 2.x
line of releases. The language is mostly the same, but many details, especially