diff options
author | Benjamin Peterson <benjamin@python.org> | 2016-01-01 16:24:21 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2016-01-01 16:24:21 (GMT) |
commit | e8c2a957c87980a1fd79c39597d40e5c5aeb7048 (patch) | |
tree | c36a10e89151a09d87975daea55bae1f358b1377 | |
parent | 52d6c2c4c07e3e850db8cf6574619c8f24a0fb39 (diff) | |
parent | 75e3630c6071819d3674d956ea754ccb4fed5271 (diff) | |
download | cpython-e8c2a957c87980a1fd79c39597d40e5c5aeb7048.zip cpython-e8c2a957c87980a1fd79c39597d40e5c5aeb7048.tar.gz cpython-e8c2a957c87980a1fd79c39597d40e5c5aeb7048.tar.bz2 |
merge 3.3
-rw-r--r-- | Doc/copyright.rst | 2 | ||||
-rw-r--r-- | Doc/license.rst | 6 | ||||
-rw-r--r-- | LICENSE | 2 | ||||
-rw-r--r-- | PC/python_nt.rc | 2 | ||||
-rw-r--r-- | Python/getcopyright.c | 2 | ||||
-rw-r--r-- | README | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/Doc/copyright.rst b/Doc/copyright.rst index 2b2f887..22d7705 100644 --- a/Doc/copyright.rst +++ b/Doc/copyright.rst @@ -4,7 +4,7 @@ Copyright Python and this documentation is: -Copyright © 2001-2015 Python Software Foundation. All rights reserved. +Copyright © 2001-2016 Python Software Foundation. All rights reserved. Copyright © 2000 BeOpen.com. All rights reserved. diff --git a/Doc/license.rst b/Doc/license.rst index 53a1c4d..8a613b2 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -84,9 +84,9 @@ 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-2015 Python Software Foundation; All - Rights Reserved" are retained in Python |release| alone or in any derivative - version prepared by Licensee. + copyright, i.e., "Copyright © 2001-2016 Python Software Foundation; All Rights + Reserved" are retained in Python |release| alone or in any derivative version + prepared by Licensee. #. In the event Licensee prepares a derivative work that is based on or incorporates Python |release| or any part thereof, and wants to make the @@ -74,7 +74,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, 2014, 2015 Python Software Foundation; All Rights Reserved" +2011, 2012, 2013, 2014, 2015,2016 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 diff --git a/PC/python_nt.rc b/PC/python_nt.rc index f85d539..0fbdbe0 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-2015 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0" + VALUE "LegalCopyright", "Copyright © 2001-2016 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 2ad2848..c3f1e89 100644 --- a/Python/getcopyright.c +++ b/Python/getcopyright.c @@ -4,7 +4,7 @@ static const char cprt[] = "\ -Copyright (c) 2001-2015 Python Software Foundation.\n\ +Copyright (c) 2001-2016 Python Software Foundation.\n\ All Rights Reserved.\n\ \n\ Copyright (c) 2000 BeOpen.com.\n\ @@ -2,7 +2,7 @@ This is Python version 3.4.4 ============================ Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013, 2014, 2015 Python Software Foundation. All rights reserved. +2012, 2013, 2014, 2015, 2016 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 |