Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bring Python into the new year. (GH-24036) (GH-24052)
Browse files Browse the repository at this point in the history
(cherry picked from commit de6f20a)

Co-authored-by: Dong-hee Na <donghee.na@python.org>
miss-islington and corona10 authored Jan 1, 2021

Verified

This commit was signed with the committer’s verified signature.
scala-steward Scala Steward
1 parent 8200ee6 commit 117830d
Showing 9 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Doc/copyright.rst
Original file line number Diff line number Diff line change
@@ -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.

2 changes: 1 addition & 1 deletion Doc/license.rst
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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.

2 changes: 1 addition & 1 deletion Mac/IDLE/IDLE.app/Contents/Info.plist
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion Mac/PythonLauncher/Info.plist.in
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion Mac/Resources/app/Info.plist.in
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion PC/python_ver_rc.h
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion Python/getcopyright.c
Original file line number Diff line number Diff line change
@@ -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\
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ This is Python version 3.7.9+
:alt: CPython code coverage on Codecov
:target: https://codecov.io/gh/python/cpython/branch/3.7

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.

@@ -242,7 +242,7 @@ See :pep:`537` for Python 3.7 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.

0 comments on commit 117830d

Please sign in to comment.