[3.6] Bring Python into the new year. (GH-24036). (GH-24054)

(cherry picked from commit de6f20a6de48d63066b2cf5b317f50629f01d74a)

Co-authored-by: Dong-hee Na <donghee.na@python.org>

diff --git a/Doc/copyright.rst b/Doc/copyright.rst
index 1b90d9f172c992e852a95fd128f92e06dd776cc4..4191c0bb63a2c1fde73c0457472d646006fb9343 100644 (file)
--- a/Doc/copyright.rst
+++ b/Doc/copyright.rst
@@ -4,7 +4,7 @@ Copyright
 
 Python and this documentation is:
 
-Copyright © 2001-2020 Python Software Foundation. All rights reserved.
+Copyright © 2001-2021 Python Software Foundation. All rights reserved.
 
 Copyright © 2000 BeOpen.com. All rights reserved.
 

diff --git a/Doc/license.rst b/Doc/license.rst
index c046cd2a3593621b2da6d0400fcda7ec56879cb2..2b5ac8ff5f0b061b14d0d6da5af20c43e9be582c 100644 (file)
--- 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-2020 Python Software Foundation; All Rights
+      copyright, i.e., "Copyright © 2001-2021 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 66a3ac80d729a3a5bdfd22002d34be59a6daf222..877c0675137815f2bde7d3893aad56570cfb17ea 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, 2020 Python Software Foundation;
+2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 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 dcc48abdd2a395aa7605170c0b3cf71c18af8635..f6b5cfe8d5451f7a7e2d60b8ee1706908494dc0c 100644 (file)
--- 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-2020 Python Software Foundation</string>
+       <string>%version%, © 2001-2021 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 21a051535fb92523a37a2cc92ebc52e79f28eb20..3d8bc3e4154ee28a3636d5b77c34c026b3a42476 100644 (file)
--- 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-2020 Python Software Foundation</string>
+       <string>%VERSION%, © 2001-2021 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 1d624984a852038c4b40051ef4a7de83d608fe00..2c801332332b30fa2906a0de0cff5f9cb18e55a3 100644 (file)
--- 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-2020 Python Software Foundation.</string>
+       <string>%version%, (c) 2001-2021 Python Software Foundation.</string>
        <key>CFBundleName</key>
        <string>Python</string>
        <key>CFBundlePackageType</key>

diff --git a/PC/python_ver_rc.h b/PC/python_ver_rc.h
index f95e755bb8bd786c641ba8e9107218ff78b43cb0..bc4ab34c7127803b52d44e331a2c606565462ca3 100644 (file)
--- a/PC/python_ver_rc.h
+++ b/PC/python_ver_rc.h
@@ -4,7 +4,7 @@
 #include "winver.h"
 
 #define PYTHON_COMPANY   "Python Software Foundation"
-#define PYTHON_COPYRIGHT "Copyright \xA9 2001-2016 Python Software Foundation. Copyright \xA9 2000 BeOpen.com. Copyright \xA9 1995-2001 CNRI. Copyright \xA9 1991-1995 SMC."
+#define PYTHON_COPYRIGHT "Copyright \xA9 2001-2021 Python Software Foundation. Copyright \xA9 2000 BeOpen.com. Copyright \xA9 1995-2001 CNRI. Copyright \xA9 1991-1995 SMC."
 
 #define MS_WINDOWS
 #include "modsupport.h"

diff --git a/Python/getcopyright.c b/Python/getcopyright.c
index 299ccc08c44f8348ae3a13bbe69b9401eb607090..7fdeb314d5261b97ceea5c876b82a58bc2a238d5 100644 (file)
--- a/Python/getcopyright.c
+++ b/Python/getcopyright.c
@@ -4,7 +4,7 @@
 
 static const char cprt[] =
 "\
-Copyright (c) 2001-2020 Python Software Foundation.\n\
+Copyright (c) 2001-2021 Python Software Foundation.\n\
 All Rights Reserved.\n\
 \n\
 Copyright (c) 2000 BeOpen.com.\n\

diff --git a/README.rst b/README.rst
index b6b587702a9d3814fd5700cfc2e032a7509cbe60..4bed1d47ce427ae750e8bc0ec91fee7c83f9312e 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -17,7 +17,7 @@ This is Python version 3.6.12+
    :alt: CPython code coverage on Codecov
    :target: https://codecov.io/gh/python/cpython
 
-Copyright (c) 2001-2020 Python Software Foundation.  All rights reserved.
+Copyright (c) 2001-2021 Python Software Foundation.  All rights reserved.
 
 See the end of this file for further copyright and license information.
 
@@ -65,8 +65,8 @@ elsewhere it's just ``python``.
 
 If you are running on macOS with the latest updates installed, make sure to install
 openSSL or some other SSL software along with Homebrew or another package manager.
-If issues persist, see https://devguide.python.org/setup/#macos-and-os-x for more 
-information. 
+If issues persist, see https://devguide.python.org/setup/#macos-and-os-x for more
+information.
 
 On macOS, if you have configured Python with ``--enable-framework``, you
 should use ``make frameworkinstall`` to do the installation.  Note that this
@@ -242,7 +242,7 @@ See :pep:`494` for Python 3.6 release details.
 Copyright and License Information
 ---------------------------------
 
-Copyright (c) 2001-2020 Python Software Foundation.  All rights reserved.
+Copyright (c) 2001-2021 Python Software Foundation.  All rights reserved.
 
 Copyright (c) 2000 BeOpen.com.  All rights reserved.