Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gh-126133: Only use start year in PSF copyright, remove end years #126236

Merged
merged 3 commits into from
Nov 12, 2024
Merged

gh-126133: Only use start year in PSF copyright, remove end years #126236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be43ed7
Only use start year, remove end years in 2020s: Copyright (c) YYYY Py…
hugovk Oct 31, 2024
e609f90
Only use start year, remove end years in 2010s: Copyright (c) YYYY Py…
hugovk Oct 31, 2024
456e155
Only use start year, remove end years in 2000s: Copyright (c) YYYY Py…
hugovk Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions Doc/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,7 @@

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

# We look for the Include/patchlevel.h file in the current Python source tree
# and replace the values accordingly.
Expand Down
2 changes: 1 addition & 1 deletion Doc/copyright.rst
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This case (where there's multiple consecutive entries) makes me slightly prefer the -present form, as we have [1991-1995], [1995-2000], [2001], and then 2001 again. Or, we could remove the end years from the old entries, but I assume that would be more difficult to do?

A

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Copyright

Python and this documentation is:

Copyright © 2001-2024 Python Software Foundation. All rights reserved.
Copyright © 2001 Python Software Foundation. All rights reserved.

Copyright © 2000 BeOpen.com. All rights reserved.

Expand Down
2 changes: 1 addition & 1 deletion Doc/license.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,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-2024 Python Software Foundation; All Rights
copyright, i.e., "Copyright © 2001 Python Software Foundation; All Rights
Reserved" are retained in Python |release| alone or in any derivative version
prepared by Licensee.

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ 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 (c) 2001-2024 Python Software Foundation; All Rights Reserved"
i.e., "Copyright (c) 2001 Python Software Foundation; All Rights Reserved"
are retained in Python alone or in any derivative version prepared by Licensee.

3. In the event Licensee prepares a derivative work that is based on
Expand Down
2 changes: 1 addition & 1 deletion Lib/email/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2007 Python Software Foundation
# Copyright (C) 2001 Python Software Foundation
# Author: Barry Warsaw
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we remove the copyright comments in files where the sole holder is the PSF? The general licence would cover this, I think?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Me too
#126133 (comment)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my personal preference is to not remove statements that exist. just get us out of the continually sometimes updating the year heck. :)

# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/_parseaddr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2002-2007 Python Software Foundation
# Copyright (C) 2002 Python Software Foundation
# Contact: [email protected]

"""Email address parsing code.
Expand Down
2 changes: 1 addition & 1 deletion Lib/email/base64mime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2002-2007 Python Software Foundation
# Copyright (C) 2002 Python Software Foundation
# Author: Ben Gertzfield
# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/charset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2007 Python Software Foundation
# Copyright (C) 2001 Python Software Foundation
# Author: Ben Gertzfield, Barry Warsaw
# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/encoders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2006 Python Software Foundation
# Copyright (C) 2001 Python Software Foundation
# Author: Barry Warsaw
# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/errors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2006 Python Software Foundation
# Copyright (C) 2001 Python Software Foundation
# Author: Barry Warsaw
# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/feedparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2004-2006 Python Software Foundation
# Copyright (C) 2004 Python Software Foundation
# Authors: Baxter, Wouters and Warsaw
hugovk marked this conversation as resolved.
Show resolved Hide resolved
# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2010 Python Software Foundation
# Copyright (C) 2001 Python Software Foundation
# Author: Barry Warsaw
# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/header.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2002-2007 Python Software Foundation
# Copyright (C) 2002 Python Software Foundation
# Author: Ben Gertzfield, Barry Warsaw
# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/iterators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2006 Python Software Foundation
# Copyright (C) 2001 Python Software Foundation
# Author: Barry Warsaw
# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/message.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2007 Python Software Foundation
# Copyright (C) 2001 Python Software Foundation
# Author: Barry Warsaw
# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/mime/application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2006 Python Software Foundation
# Copyright (C) 2001 Python Software Foundation
# Author: Keith Dart
# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/mime/audio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2007 Python Software Foundation
# Copyright (C) 2001 Python Software Foundation
# Author: Anthony Baxter
# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/mime/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2006 Python Software Foundation
# Copyright (C) 2001 Python Software Foundation
# Author: Barry Warsaw
# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/mime/image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2006 Python Software Foundation
# Copyright (C) 2001 Python Software Foundation
# Author: Barry Warsaw
# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/mime/message.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2006 Python Software Foundation
# Copyright (C) 2001 Python Software Foundation
# Author: Barry Warsaw
# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/mime/multipart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2002-2006 Python Software Foundation
# Copyright (C) 2002 Python Software Foundation
# Author: Barry Warsaw
# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/mime/nonmultipart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2002-2006 Python Software Foundation
# Copyright (C) 2002 Python Software Foundation
# Author: Barry Warsaw
# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/mime/text.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2006 Python Software Foundation
# Copyright (C) 2001 Python Software Foundation
# Author: Barry Warsaw
# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2007 Python Software Foundation
# Copyright (C) 2001 Python Software Foundation
# Author: Barry Warsaw, Thomas Wouters, Anthony Baxter
# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/quoprimime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2006 Python Software Foundation
# Copyright (C) 2001 Python Software Foundation
# Author: Ben Gertzfield
# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2010 Python Software Foundation
# Copyright (C) 2001 Python Software Foundation
# Author: Barry Warsaw
# Contact: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Lib/functools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Written by Nick Coghlan <ncoghlan at gmail.com>,
# Raymond Hettinger <python at rcn.com>,
# and Łukasz Langa <lukasz at langa.pl>.
# Copyright (C) 2006-2024 Python Software Foundation.
# Copyright (C) 2006 Python Software Foundation.
# See C source code for _functools credits/copyright

__all__ = ['update_wrapper', 'wraps', 'WRAPPER_ASSIGNMENTS', 'WRAPPER_UPDATES',
Expand Down
2 changes: 1 addition & 1 deletion Lib/optparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

__copyright__ = """
Copyright (c) 2001-2006 Gregory P. Ward. All rights reserved.
Copyright (c) 2002-2006 Python Software Foundation. All rights reserved.
Copyright (c) 2002 Python Software Foundation. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_csv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001,2002 Python Software Foundation
# Copyright (C) 2001 Python Software Foundation
# csv package unit tests

import copy
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_email/test_asian_codecs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2002-2006 Python Software Foundation
# Copyright (C) 2002 Python Software Foundation
# Contact: [email protected]
# email package unit tests for (optional) Asian codecs

Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_email/test_email.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2010 Python Software Foundation
# Copyright (C) 2001 Python Software Foundation
# Contact: [email protected]
# email package unit tests

Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_email/torture_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2002-2004 Python Software Foundation
# Copyright (C) 2002 Python Software Foundation
#
# A torture test of the email package. This should not be run as part of the
# standard Python test suite since it requires several meg of email messages
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_plistlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2003-2013 Python Software Foundation
# Copyright (C) 2003 Python Software Foundation
import copy
import operator
import pickle
Expand Down
2 changes: 1 addition & 1 deletion Lib/textwrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"""

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

import re
Expand Down
2 changes: 1 addition & 1 deletion Lib/unittest/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def testMultiply(self):
http://docs.python.org/library/unittest.html

Copyright (c) 1999-2003 Steve Purcell
Copyright (c) 2003-2010 Python Software Foundation
Copyright (c) 2003 Python Software Foundation
This module is free software, and you may redistribute it and/or modify
it under the same terms as Python itself, so long as this copyright message
and disclaimer are retained in their original form.
Expand Down
2 changes: 1 addition & 1 deletion Lib/wsgiref/headers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""Manage HTTP Response Headers

Much of this module is red-handedly pilfered from email.message in the stdlib,
so portions are Copyright (C) 2001,2002 Python Software Foundation, and were
so portions are Copyright (C) 2001 Python Software Foundation, and were
written by Barry Warsaw.
"""

Expand Down
2 changes: 1 addition & 1 deletion Mac/BuildScript/resources/License.rtf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Some software incorporated into Python is under different licenses. The licenses
\f1\b0 \
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.\
\
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.\
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.\
\
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.\
\
Expand Down
4 changes: 2 additions & 2 deletions Mac/PythonLauncher/Info.plist.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
<key>CFBundleExecutable</key>
<string>Python Launcher</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2001-2024 Python Software Foundation</string>
<string>Copyright © 2001 Python Software Foundation</string>
<key>CFBundleGetInfoString</key>
<string>%VERSION%, © 2001-2024 Python Software Foundation</string>
<string>%VERSION%, © 2001 Python Software Foundation</string>
<key>CFBundleIconFile</key>
<string>PythonLauncher.icns</string>
<key>CFBundleIdentifier</key>
Expand Down
2 changes: 1 addition & 1 deletion Modules/_decimal/docstrings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001-2012 Python Software Foundation. All Rights Reserved.
* Copyright (c) 2001 Python Software Foundation. All Rights Reserved.
* Modified and extended by Stefan Krah.
*/

Expand Down
2 changes: 1 addition & 1 deletion Modules/_decimal/tests/bench.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2001-2012 Python Software Foundation. All Rights Reserved.
# Copyright (C) 2001 Python Software Foundation. All Rights Reserved.
# Modified and extended by Stefan Krah.
#

Expand Down
2 changes: 1 addition & 1 deletion Modules/_functoolsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class _functools._lru_cache_wrapper "PyObject *" "&lru_cache_type_spec"
/* _functools module written and maintained
by Hye-Shik Chang <[email protected]>
with adaptations by Raymond Hettinger <[email protected]>
Copyright (c) 2004, 2005, 2006 Python Software Foundation.
Copyright (c) 2004 Python Software Foundation.
All rights reserved.
*/

Expand Down
2 changes: 1 addition & 1 deletion PC/python_ver_rc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "winver.h"

#define PYTHON_COMPANY "Python Software Foundation"
#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."
#define PYTHON_COPYRIGHT "Copyright \xA9 2001 Python Software Foundation. Copyright \xA9 2000 BeOpen.com. Copyright \xA9 1995-2001 CNRI. Copyright \xA9 1991-1995 SMC."

#define MS_WINDOWS
#include "modsupport.h"
Expand Down
2 changes: 1 addition & 1 deletion PC/store_info.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ PSF LICENSE AGREEMENT FOR PYTHON 3.9
analyze, test, perform and/or display publicly, prepare derivative works,
distribute, and otherwise use Python 3.9 alone or in any derivative
version, provided, however, that PSF's License Agreement and PSF's notice of
copyright, i.e., "Copyright © 2001-2018 Python Software Foundation; All Rights
copyright, i.e., "Copyright © 2001 Python Software Foundation; All Rights
Reserved" are retained in Python 3.9 alone or in any derivative version
prepared by Licensee.

Expand Down
2 changes: 1 addition & 1 deletion Python/getcopyright.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

static const char cprt[] =
"\
Copyright (c) 2001-2024 Python Software Foundation.\n\
Copyright (c) 2001 Python Software Foundation.\n\
All Rights Reserved.\n\
\n\
Copyright (c) 2000 BeOpen.com.\n\
Expand Down
4 changes: 2 additions & 2 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ This is Python version 3.14.0 alpha 1
:target: https://discuss.python.org/


Copyright © 2001-2024 Python Software Foundation. All rights reserved.
Copyright © 2001 Python Software Foundation. All rights reserved.

See the end of this file for further copyright and license information.

Expand Down Expand Up @@ -215,7 +215,7 @@ Copyright and License Information
---------------------------------


Copyright © 2001-2024 Python Software Foundation. All rights reserved.
Copyright © 2001 Python Software Foundation. All rights reserved.

Copyright © 2000 BeOpen.com. All rights reserved.

Expand Down
Loading