]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.6] Bring Python into the next decade. (GH-17804)
authorBenjamin Peterson <benjamin@python.org>
Fri, 3 Jan 2020 03:13:57 +0000 (19:13 -0800)
committerGitHub <noreply@github.com>
Fri, 3 Jan 2020 03:13:57 +0000 (19:13 -0800)
(cherry picked from commit 946b29ea0b3b386ed05e87e60b8617c9dc19cd53)

Co-authored-by: Benjamin Peterson <benjamin@python.org>
Doc/copyright.rst
Doc/license.rst
LICENSE
Mac/IDLE/IDLE.app/Contents/Info.plist
Mac/PythonLauncher/Info.plist.in
Mac/Resources/app/Info.plist.in
Python/getcopyright.c
README.rst

index 393a1f03751f823fdc370686ebaf3aa6fb848099..1b90d9f172c992e852a95fd128f92e06dd776cc4 100644 (file)
@@ -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.
 
index ed8b8bc65348e2948790505111bba68847cf7362..c046cd2a3593621b2da6d0400fcda7ec56879cb2 100644 (file)
@@ -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.
 
diff --git a/LICENSE b/LICENSE
index 9dc010d80348fcce0c7ec1a57da2123e79412566..66a3ac80d729a3a5bdfd22002d34be59a6daf222 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -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.
 
index 04a0a08c836395ddeeed0858c147af61fc29cc6d..dcc48abdd2a395aa7605170c0b3cf71c18af8635 100644 (file)
@@ -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>
index 9fb4e0affd9c43288af7a0403ab3dbba8715e0a7..21a051535fb92523a37a2cc92ebc52e79f28eb20 100644 (file)
@@ -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>
index b7581984dd6764e5a86eb324d652ed185244de5c..66b5e764c54b0b21e3c7ffe3953cb35dca83c42e 100644 (file)
@@ -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>
index 27a1731f46ded490c47b1dbf0120e92643c36d8e..299ccc08c44f8348ae3a13bbe69b9401eb607090 100644 (file)
@@ -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\
index 9c8c15858ebd5af5b06f9d134cec2c42096312b5..81d457c5640b555b71364835c21555c765587ed0 100644 (file)
@@ -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.