Skip to content

Commit 91f4908

Browse files
hugovkhugovk
authored
gh-126133: Only use start year in PSF copyright, remove end years (#126236)
1 parent 8ff7efb commit 91f4908

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+47
-50
lines changed

‎Doc/conf.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,7 @@
6767

6868
# General substitutions.
6969
project = 'Python'
70-
if sphinx.version_info[:2] >= (8, 1):
71-
copyright = "2001-%Y, Python Software Foundation"
72-
else:
73-
copyright = f"2001-{time.strftime('%Y')}, Python Software Foundation"
70+
copyright = "2001 Python Software Foundation"
7471

7572
# We look for the Include/patchlevel.h file in the current Python source tree
7673
# and replace the values accordingly.

‎Doc/copyright.rst

+1-1

‎Doc/license.rst

+1-1

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
8383
analyze, test, perform and/or display publicly, prepare derivative works,
8484
distribute, and otherwise use Python alone or in any derivative version,
8585
provided, however, that PSF's License Agreement and PSF's notice of copyright,
86-
i.e., "Copyright (c) 2001-2024 Python Software Foundation; All Rights Reserved"
86+
i.e., "Copyright (c) 2001 Python Software Foundation; All Rights Reserved"
8787
are retained in Python alone or in any derivative version prepared by Licensee.
8888

8989
3. In the event Licensee prepares a derivative work that is based on

‎Lib/email/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2007 Python Software Foundation
1+
# Copyright (C) 2001 Python Software Foundation
22
# Author: Barry Warsaw
33
# Contact: [email protected]
44

‎Lib/email/_parseaddr.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2002-2007 Python Software Foundation
1+
# Copyright (C) 2002 Python Software Foundation
22
# Contact: [email protected]
33

44
"""Email address parsing code.

‎Lib/email/base64mime.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2002-2007 Python Software Foundation
1+
# Copyright (C) 2002 Python Software Foundation
22
# Author: Ben Gertzfield
33
# Contact: [email protected]
44

‎Lib/email/charset.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2007 Python Software Foundation
1+
# Copyright (C) 2001 Python Software Foundation
22
# Author: Ben Gertzfield, Barry Warsaw
33
# Contact: [email protected]
44

‎Lib/email/encoders.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2006 Python Software Foundation
1+
# Copyright (C) 2001 Python Software Foundation
22
# Author: Barry Warsaw
33
# Contact: [email protected]
44

‎Lib/email/errors.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2006 Python Software Foundation
1+
# Copyright (C) 2001 Python Software Foundation
22
# Author: Barry Warsaw
33
# Contact: [email protected]
44

‎Lib/email/feedparser.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2004-2006 Python Software Foundation
1+
# Copyright (C) 2004 Python Software Foundation
22
# Authors: Baxter, Wouters and Warsaw
33
# Contact: [email protected]
44

‎Lib/email/generator.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2010 Python Software Foundation
1+
# Copyright (C) 2001 Python Software Foundation
22
# Author: Barry Warsaw
33
# Contact: [email protected]
44

‎Lib/email/header.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2002-2007 Python Software Foundation
1+
# Copyright (C) 2002 Python Software Foundation
22
# Author: Ben Gertzfield, Barry Warsaw
33
# Contact: [email protected]
44

‎Lib/email/iterators.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2006 Python Software Foundation
1+
# Copyright (C) 2001 Python Software Foundation
22
# Author: Barry Warsaw
33
# Contact: [email protected]
44

‎Lib/email/message.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2007 Python Software Foundation
1+
# Copyright (C) 2001 Python Software Foundation
22
# Author: Barry Warsaw
33
# Contact: [email protected]
44

‎Lib/email/mime/application.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2006 Python Software Foundation
1+
# Copyright (C) 2001 Python Software Foundation
22
# Author: Keith Dart
33
# Contact: [email protected]
44

‎Lib/email/mime/audio.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2007 Python Software Foundation
1+
# Copyright (C) 2001 Python Software Foundation
22
# Author: Anthony Baxter
33
# Contact: [email protected]
44

‎Lib/email/mime/base.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2006 Python Software Foundation
1+
# Copyright (C) 2001 Python Software Foundation
22
# Author: Barry Warsaw
33
# Contact: [email protected]
44

‎Lib/email/mime/image.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2006 Python Software Foundation
1+
# Copyright (C) 2001 Python Software Foundation
22
# Author: Barry Warsaw
33
# Contact: [email protected]
44

‎Lib/email/mime/message.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2006 Python Software Foundation
1+
# Copyright (C) 2001 Python Software Foundation
22
# Author: Barry Warsaw
33
# Contact: [email protected]
44

‎Lib/email/mime/multipart.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2002-2006 Python Software Foundation
1+
# Copyright (C) 2002 Python Software Foundation
22
# Author: Barry Warsaw
33
# Contact: [email protected]
44

‎Lib/email/mime/nonmultipart.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2002-2006 Python Software Foundation
1+
# Copyright (C) 2002 Python Software Foundation
22
# Author: Barry Warsaw
33
# Contact: [email protected]
44

‎Lib/email/mime/text.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2006 Python Software Foundation
1+
# Copyright (C) 2001 Python Software Foundation
22
# Author: Barry Warsaw
33
# Contact: [email protected]
44

‎Lib/email/parser.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2007 Python Software Foundation
1+
# Copyright (C) 2001 Python Software Foundation
22
# Author: Barry Warsaw, Thomas Wouters, Anthony Baxter
33
# Contact: [email protected]
44

‎Lib/email/quoprimime.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2006 Python Software Foundation
1+
# Copyright (C) 2001 Python Software Foundation
22
# Author: Ben Gertzfield
33
# Contact: [email protected]
44

‎Lib/email/utils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2010 Python Software Foundation
1+
# Copyright (C) 2001 Python Software Foundation
22
# Author: Barry Warsaw
33
# Contact: [email protected]
44

‎Lib/functools.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Written by Nick Coghlan <ncoghlan at gmail.com>,
77
# Raymond Hettinger <python at rcn.com>,
88
# and Łukasz Langa <lukasz at langa.pl>.
9-
# Copyright (C) 2006-2024 Python Software Foundation.
9+
# Copyright (C) 2006 Python Software Foundation.
1010
# See C source code for _functools credits/copyright
1111

1212
__all__ = ['update_wrapper', 'wraps', 'WRAPPER_ASSIGNMENTS', 'WRAPPER_UPDATES',

‎Lib/optparse.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
__copyright__ = """
4545
Copyright (c) 2001-2006 Gregory P. Ward. All rights reserved.
46-
Copyright (c) 2002-2006 Python Software Foundation. All rights reserved.
46+
Copyright (c) 2002 Python Software Foundation. All rights reserved.
4747
4848
Redistribution and use in source and binary forms, with or without
4949
modification, are permitted provided that the following conditions are

‎Lib/test/test_csv.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001,2002 Python Software Foundation
1+
# Copyright (C) 2001 Python Software Foundation
22
# csv package unit tests
33

44
import copy

‎Lib/test/test_email/test_asian_codecs.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2002-2006 Python Software Foundation
1+
# Copyright (C) 2002 Python Software Foundation
22
# Contact: [email protected]
33
# email package unit tests for (optional) Asian codecs
44

‎Lib/test/test_email/test_email.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2010 Python Software Foundation
1+
# Copyright (C) 2001 Python Software Foundation
22
# Contact: [email protected]
33
# email package unit tests
44

‎Lib/test/test_email/torture_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2002-2004 Python Software Foundation
1+
# Copyright (C) 2002 Python Software Foundation
22
#
33
# A torture test of the email package. This should not be run as part of the
44
# standard Python test suite since it requires several meg of email messages

‎Lib/test/test_plistlib.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2003-2013 Python Software Foundation
1+
# Copyright (C) 2003 Python Software Foundation
22
import copy
33
import operator
44
import pickle

‎Lib/textwrap.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"""
33

44
# Copyright (C) 1999-2001 Gregory P. Ward.
5-
# Copyright (C) 2002, 2003 Python Software Foundation.
5+
# Copyright (C) 2002 Python Software Foundation.
66
# Written by Greg Ward <[email protected]>
77

88
import re

‎Lib/unittest/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def testMultiply(self):
2727
http://docs.python.org/library/unittest.html
2828
2929
Copyright (c) 1999-2003 Steve Purcell
30-
Copyright (c) 2003-2010 Python Software Foundation
30+
Copyright (c) 2003 Python Software Foundation
3131
This module is free software, and you may redistribute it and/or modify
3232
it under the same terms as Python itself, so long as this copyright message
3333
and disclaimer are retained in their original form.

‎Lib/wsgiref/headers.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Manage HTTP Response Headers
22
33
Much of this module is red-handedly pilfered from email.message in the stdlib,
4-
so portions are Copyright (C) 2001,2002 Python Software Foundation, and were
4+
so portions are Copyright (C) 2001 Python Software Foundation, and were
55
written by Barry Warsaw.
66
"""
77

‎Mac/BuildScript/resources/License.rtf

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Some software incorporated into Python is under different licenses. The licenses
6464
\f1\b0 \
6565
1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and the Individual or Organization ("Licensee") accessing and otherwise using this software ("Python") in source or binary form and its associated documentation.\
6666
\
67-
2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, 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 \'a9 2001-2020 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee.\
67+
2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, 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 \'a9 2001 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee.\
6868
\
6969
3. In the event Licensee prepares a derivative work that is based on or incorporates Python or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of the changes made to Python.\
7070
\

‎Mac/PythonLauncher/Info.plist.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
<key>CFBundleExecutable</key>
4141
<string>Python Launcher</string>
4242
<key>NSHumanReadableCopyright</key>
43-
<string>Copyright © 2001-2024 Python Software Foundation</string>
43+
<string>Copyright © 2001 Python Software Foundation</string>
4444
<key>CFBundleGetInfoString</key>
45-
<string>%VERSION%, © 2001-2024 Python Software Foundation</string>
45+
<string>%VERSION%, © 2001 Python Software Foundation</string>
4646
<key>CFBundleIconFile</key>
4747
<string>PythonLauncher.icns</string>
4848
<key>CFBundleIdentifier</key>

‎Modules/_decimal/docstrings.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2001-2012 Python Software Foundation. All Rights Reserved.
2+
* Copyright (c) 2001 Python Software Foundation. All Rights Reserved.
33
* Modified and extended by Stefan Krah.
44
*/
55

‎Modules/_decimal/tests/bench.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2001-2012 Python Software Foundation. All Rights Reserved.
2+
# Copyright (C) 2001 Python Software Foundation. All Rights Reserved.
33
# Modified and extended by Stefan Krah.
44
#
55

‎Modules/_functoolsmodule.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class _functools._lru_cache_wrapper "PyObject *" "&lru_cache_type_spec"
1818
/* _functools module written and maintained
1919
by Hye-Shik Chang <[email protected]>
2020
with adaptations by Raymond Hettinger <[email protected]>
21-
Copyright (c) 2004, 2005, 2006 Python Software Foundation.
21+
Copyright (c) 2004 Python Software Foundation.
2222
All rights reserved.
2323
*/
2424

‎PC/python_ver_rc.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "winver.h"
66

77
#define PYTHON_COMPANY "Python Software Foundation"
8-
#define PYTHON_COPYRIGHT "Copyright \xA9 2001-2024 Python Software Foundation. Copyright \xA9 2000 BeOpen.com. Copyright \xA9 1995-2001 CNRI. Copyright \xA9 1991-1995 SMC."
8+
#define PYTHON_COPYRIGHT "Copyright \xA9 2001 Python Software Foundation. Copyright \xA9 2000 BeOpen.com. Copyright \xA9 1995-2001 CNRI. Copyright \xA9 1991-1995 SMC."
99

1010
#define MS_WINDOWS
1111
#include "modsupport.h"

‎PC/store_info.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ PSF LICENSE AGREEMENT FOR PYTHON 3.9
109109
analyze, test, perform and/or display publicly, prepare derivative works,
110110
distribute, and otherwise use Python 3.9 alone or in any derivative
111111
version, provided, however, that PSF's License Agreement and PSF's notice of
112-
copyright, i.e., "Copyright © 2001-2018 Python Software Foundation; All Rights
112+
copyright, i.e., "Copyright © 2001 Python Software Foundation; All Rights
113113
Reserved" are retained in Python 3.9 alone or in any derivative version
114114
prepared by Licensee.
115115

‎Python/getcopyright.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
static const char cprt[] =
66
"\
7-
Copyright (c) 2001-2024 Python Software Foundation.\n\
7+
Copyright (c) 2001 Python Software Foundation.\n\
88
All Rights Reserved.\n\
99
\n\
1010
Copyright (c) 2000 BeOpen.com.\n\

‎README.rst

+2-2

0 commit comments

Comments
 (0)