diff options
author | 2020-01-02 19:13:57 -0800 | |
---|---|---|
committer | 2020-01-02 19:13:57 -0800 | |
commit | a9964b0aca784c16227a703626701e9003bdebf6 (patch) | |
tree | 0e1f6c1bdd76ae1f127e120a548b92664b772e4d | |
parent | Post release updates (diff) | |
download | cpython-a9964b0aca784c16227a703626701e9003bdebf6.tar.gz cpython-a9964b0aca784c16227a703626701e9003bdebf6.tar.bz2 cpython-a9964b0aca784c16227a703626701e9003bdebf6.zip |
[3.6] Bring Python into the next decade. (GH-17804)
(cherry picked from commit 946b29ea0b3b386ed05e87e60b8617c9dc19cd53)
Co-authored-by: Benjamin Peterson <benjamin@python.org>
-rw-r--r-- | Doc/copyright.rst | 2 | ||||
-rw-r--r-- | Doc/license.rst | 2 | ||||
-rw-r--r-- | LICENSE | 2 | ||||
-rw-r--r-- | Mac/IDLE/IDLE.app/Contents/Info.plist | 2 | ||||
-rw-r--r-- | Mac/PythonLauncher/Info.plist.in | 2 | ||||
-rw-r--r-- | Mac/Resources/app/Info.plist.in | 2 | ||||
-rw-r--r-- | Python/getcopyright.c | 2 | ||||
-rw-r--r-- | README.rst | 8 |
8 files changed, 9 insertions, 13 deletions
diff --git a/Doc/copyright.rst b/Doc/copyright.rst index 393a1f0375..1b90d9f172 100644 --- a/Doc/copyright.rst +++ b/Doc/copyright.rst @@ -4,7 +4,7 @@ Copyright Python and this documentation is: -Copyright © 2001-2019 Python Software Foundation. All rights reserved. +Copyright © 2001-2020 Python Software Foundation. All rights reserved. Copyright © 2000 BeOpen.com. All rights reserved. diff --git a/Doc/license.rst b/Doc/license.rst index ed8b8bc653..c046cd2a35 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -87,7 +87,7 @@ PSF LICENSE AGREEMENT FOR PYTHON |release| 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-2019 Python Software Foundation; All Rights + copyright, i.e., "Copyright © 2001-2020 Python Software Foundation; All Rights Reserved" are retained in Python |release| alone or in any derivative version prepared by Licensee. @@ -73,7 +73,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, 2016, 2017, 2018, 2019 Python Software Foundation; +2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee. diff --git a/Mac/IDLE/IDLE.app/Contents/Info.plist b/Mac/IDLE/IDLE.app/Contents/Info.plist index 04a0a08c83..dcc48abdd2 100644 --- a/Mac/IDLE/IDLE.app/Contents/Info.plist +++ b/Mac/IDLE/IDLE.app/Contents/Info.plist @@ -36,7 +36,7 @@ <key>CFBundleExecutable</key> <string>IDLE</string> <key>CFBundleGetInfoString</key> - <string>%version%, © 2001-2019 Python Software Foundation</string> + <string>%version%, © 2001-2020 Python Software Foundation</string> <key>CFBundleIconFile</key> <string>IDLE.icns</string> <key>CFBundleIdentifier</key> diff --git a/Mac/PythonLauncher/Info.plist.in b/Mac/PythonLauncher/Info.plist.in index 9fb4e0affd..21a051535f 100644 --- a/Mac/PythonLauncher/Info.plist.in +++ b/Mac/PythonLauncher/Info.plist.in @@ -40,7 +40,7 @@ <key>CFBundleExecutable</key> <string>Python Launcher</string> <key>CFBundleGetInfoString</key> - <string>%VERSION%, © 2001-2019 Python Software Foundation</string> + <string>%VERSION%, © 2001-2020 Python Software Foundation</string> <key>CFBundleIconFile</key> <string>PythonLauncher.icns</string> <key>CFBundleIdentifier</key> diff --git a/Mac/Resources/app/Info.plist.in b/Mac/Resources/app/Info.plist.in index b7581984dd..66b5e764c5 100644 --- a/Mac/Resources/app/Info.plist.in +++ b/Mac/Resources/app/Info.plist.in @@ -37,7 +37,7 @@ <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleLongVersionString</key> - <string>%version%, (c) 2001-2019 Python Software Foundation.</string> + <string>%version%, (c) 2001-2020 Python Software Foundation.</string> <key>CFBundleName</key> <string>Python</string> <key>CFBundlePackageType</key> diff --git a/Python/getcopyright.c b/Python/getcopyright.c index 27a1731f46..299ccc08c4 100644 --- a/Python/getcopyright.c +++ b/Python/getcopyright.c @@ -4,7 +4,7 @@ static const char cprt[] = "\ -Copyright (c) 2001-2019 Python Software Foundation.\n\ +Copyright (c) 2001-2020 Python Software Foundation.\n\ All Rights Reserved.\n\ \n\ Copyright (c) 2000 BeOpen.com.\n\ diff --git a/README.rst b/README.rst index 9c8c15858e..81d457c564 100644 --- a/README.rst +++ b/README.rst @@ -17,9 +17,7 @@ This is Python version 3.6.10+ :alt: CPython code coverage on Codecov :target: https://codecov.io/gh/python/cpython -Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Python Software Foundation. All -rights reserved. +Copyright (c) 2001-2020 Python Software Foundation. All rights reserved. See the end of this file for further copyright and license information. @@ -244,9 +242,7 @@ See :pep:`494` for Python 3.6 release details. Copyright and License Information --------------------------------- -Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Python Software Foundation. All -rights reserved. +Copyright (c) 2001-2020 Python Software Foundation. All rights reserved. Copyright (c) 2000 BeOpen.com. All rights reserved. |