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.

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

Update Python Software Foundation Copyright Year. #4

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion Doc/copyright.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Copyright

Python and this documentation is:

Copyright © 2001-2016 Python Software Foundation. All rights reserved.
Copyright © 2001-2017 Python Software Foundation. All rights reserved.

Copyright © 2000 BeOpen.com. All rights reserved.

Expand Down
2 changes: 1 addition & 1 deletion Lib/_pydecimal.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2004 Python Software Foundation.
# Copyright (c) 2017 Python Software Foundation.
Copy link
Contributor

Choose a reason for hiding this comment

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

Perhaps on these where the source was a single year, it should convert to 2004-2017

Copy link
Contributor

Choose a reason for hiding this comment

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

Usually Copyright (c) <year> means <year>-present, IMHO this should stay 2004. and 2017 -> Present.

This avoid churn on file and to keep them updated.

Copy link
Member

Choose a reason for hiding this comment

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

Maybe change this PR to strip the date range from the first one and leave the other alone? @VanL can you weigh in?

# All rights reserved.

# Written by Eric Price <eprice at tjhsst.edu>
Expand Down
2 changes: 1 addition & 1 deletion Lib/email/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2007 Python Software Foundation
# Copyright (C) 2001-2017 Python Software Foundation
# Author: Barry Warsaw
# Contact: email-sig@python.org

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/_parseaddr.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2002-2007 Python Software Foundation
# Copyright (C) 2002-2017 Python Software Foundation
# Contact: email-sig@python.org

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

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/charset.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2007 Python Software Foundation
# Copyright (C) 2001-2017 Python Software Foundation
# Author: Ben Gertzfield, Barry Warsaw
# Contact: email-sig@python.org

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/encoders.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2006 Python Software Foundation
# Copyright (C) 2001-2017 Python Software Foundation
# Author: Barry Warsaw
# Contact: email-sig@python.org

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/errors.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2006 Python Software Foundation
# Copyright (C) 2001-2017 Python Software Foundation
# Author: Barry Warsaw
# Contact: email-sig@python.org

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/feedparser.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2004-2006 Python Software Foundation
# Copyright (C) 2004-2017 Python Software Foundation
# Authors: Baxter, Wouters and Warsaw
# Contact: email-sig@python.org

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/generator.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2010 Python Software Foundation
# Copyright (C) 2001-2017 Python Software Foundation
# Author: Barry Warsaw
# Contact: email-sig@python.org

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/header.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2002-2007 Python Software Foundation
# Copyright (C) 2002-2017 Python Software Foundation
# Author: Ben Gertzfield, Barry Warsaw
# Contact: email-sig@python.org

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/iterators.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2006 Python Software Foundation
# Copyright (C) 2001-2017 Python Software Foundation
# Author: Barry Warsaw
# Contact: email-sig@python.org

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/message.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2007 Python Software Foundation
# Copyright (C) 2001-2017 Python Software Foundation
# Author: Barry Warsaw
# Contact: email-sig@python.org

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/mime/application.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2006 Python Software Foundation
# Copyright (C) 2001-2017 Python Software Foundation
# Author: Keith Dart
# Contact: email-sig@python.org

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/mime/audio.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2007 Python Software Foundation
# Copyright (C) 2001-2017 Python Software Foundation
# Author: Anthony Baxter
# Contact: email-sig@python.org

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/mime/base.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2006 Python Software Foundation
# Copyright (C) 2001-2017 Python Software Foundation
# Author: Barry Warsaw
# Contact: email-sig@python.org

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/mime/image.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2006 Python Software Foundation
# Copyright (C) 2001-2017 Python Software Foundation
# Author: Barry Warsaw
# Contact: email-sig@python.org

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/mime/message.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2006 Python Software Foundation
# Copyright (C) 2001-2017 Python Software Foundation
# Author: Barry Warsaw
# Contact: email-sig@python.org

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/mime/multipart.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2002-2006 Python Software Foundation
# Copyright (C) 2002-2017 Python Software Foundation
# Author: Barry Warsaw
# Contact: email-sig@python.org

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/mime/nonmultipart.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2002-2006 Python Software Foundation
# Copyright (C) 2002-2017 Python Software Foundation
# Author: Barry Warsaw
# Contact: email-sig@python.org

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/mime/text.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2006 Python Software Foundation
# Copyright (C) 2001-2017 Python Software Foundation
# Author: Barry Warsaw
# Contact: email-sig@python.org

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

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/quoprimime.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2006 Python Software Foundation
# Copyright (C) 2001-2017 Python Software Foundation
# Author: Ben Gertzfield
# Contact: email-sig@python.org

Expand Down
2 changes: 1 addition & 1 deletion Lib/email/utils.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2010 Python Software Foundation
# Copyright (C) 2001-2017 Python Software Foundation
# Author: Barry Warsaw
# Contact: email-sig@python.org

Expand Down
2 changes: 1 addition & 1 deletion Lib/functools.py
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-2013 Python Software Foundation.
# Copyright (C) 2006-2017 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/lib2to3/pgen2/tokenize.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation.
# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2017 Python Software Foundation.
Copy link
Member

Choose a reason for hiding this comment

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

This change is wrong. You should either add all years, or leave things as they are.

# All rights reserved.

"""Tokenization help for Python programs.
Expand Down
2 changes: 1 addition & 1 deletion Lib/optparse.py
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-2017 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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001,2002 Python Software Foundation
# Copyright (C) 2001,2017 Python Software Foundation
# csv package unit tests

import copy
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_decimal.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2004 Python Software Foundation.
# Copyright (c) 2017 Python Software Foundation.
# All rights reserved.

# Written by Eric Price <eprice at tjhsst.edu>
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_email/test_asian_codecs.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2002-2006 Python Software Foundation
# Copyright (C) 2002-2017 Python Software Foundation
# Contact: email-sig@python.org
# email package unit tests for (optional) Asian codecs

Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_email/test_email.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2001-2010 Python Software Foundation
# Copyright (C) 2001-2017 Python Software Foundation
# Contact: email-sig@python.org
# email package unit tests

Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_email/torture_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2002-2004 Python Software Foundation
# Copyright (C) 2002-2017 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
4 changes: 2 additions & 2 deletions Lib/test/test_gettext.py
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ def test_main():

'''
# Dummy translation for the Python test_gettext.py module.
# Copyright (C) 2001 Python Software Foundation
# Copyright (C) 2017 Python Software Foundation
# Barry Warsaw <barry@python.org>, 2000.
#
msgid ""
Expand Down Expand Up @@ -606,7 +606,7 @@ def test_main():

'''
# Dummy translation for the Python test_gettext.py module.
# Copyright (C) 2001 Python Software Foundation
# Copyright (C) 2017 Python Software Foundation
# Barry Warsaw <barry@python.org>, 2000.
#
msgid ""
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_plistlib.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2003-2013 Python Software Foundation
# Copyright (C) 2003-2017 Python Software Foundation

import unittest
import plistlib
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_shutil.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2003 Python Software Foundation
# Copyright (C) 2017 Python Software Foundation

import unittest
import unittest.mock
Expand Down
2 changes: 1 addition & 1 deletion Lib/textwrap.py
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, 2017 Python Software Foundation.
# Written by Greg Ward <gward@python.net>

import re
Expand Down
2 changes: 1 addition & 1 deletion Lib/unittest/__init__.py
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-2017 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
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,2017 Python Software Foundation, and were
written by Barry Warsaw.
"""

Expand Down
6 changes: 3 additions & 3 deletions Mac/BuildScript/resources/License.rtf
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ All Python releases are Open Source (see http://www.opensource.org for the Open

\f0 \

\b Note:
\b Note:
\b0 GPL-compatible doesn't mean that we're distributing Python under the GPL. All Python licenses, unlike the GPL, let you distribute a modified version without making your changes open source. The GPL-compatible licenses make it possible to combine Python with other software that is released under the GPL; the others don't.\
\
Thanks to the many outside volunteers who have worked under Guido's direction to make these releases possible.\
Expand All @@ -54,7 +54,7 @@ Thanks to the many outside volunteers who have worked under Guido's direction to
\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 (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 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 (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017 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 Expand Up @@ -139,4 +139,4 @@ This installer incorporates portions of the following third-party software:\
\
\
\
}
}
4 changes: 2 additions & 2 deletions Mac/Resources/app/Info.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<key>CFBundleExecutable</key>
<string>Python</string>
<key>CFBundleGetInfoString</key>
<string>%version%, (c) 2001-2016 Python Software Foundation.</string>
<string>%version%, (c) 2001-2017 Python Software Foundation.</string>
<key>CFBundleHelpBookFolder</key>
<array>
<string>Documentation</string>
Expand Down Expand Up @@ -55,7 +55,7 @@
<key>NSAppleScriptEnabled</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>(c) 2001-2016 Python Software Foundation.</string>
<string>(c) 2001-2017 Python Software Foundation.</string>
<key>NSHighResolutionCapable</key>
<true/>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion Modules/_decimal/docstrings.h
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-2017 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
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-2017 Python Software Foundation. All Rights Reserved.
# Modified and extended by Stefan Krah.
#

Expand Down
2 changes: 1 addition & 1 deletion Modules/_decimal/tests/randfloat.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2010 Python Software Foundation. All Rights Reserved.
# Copyright (c) 2017 Python Software Foundation. All Rights Reserved.
# Adapted from Python's Lib/test/test_strtod.py (by Mark Dickinson)

# More test cases for deccheck.py.
Expand Down
2 changes: 1 addition & 1 deletion Modules/_functoolsmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/* _functools module written and maintained
by Hye-Shik Chang <perky@FreeBSD.org>
with adaptations by Raymond Hettinger <python@rcn.com>
Copyright (c) 2004, 2005, 2006 Python Software Foundation.
Copyright (c) 2004, 2005, 2017 Python Software Foundation.
All rights reserved.
*/

Expand Down
2 changes: 1 addition & 1 deletion Modules/atexitmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* upon normal program termination.
*
* Translated from atexit.py by Collin Winter.
+ Copyright 2007 Python Software Foundation.
+ Copyright 2017 Python Software Foundation.
*/

#include "Python.h"
Expand Down
2 changes: 1 addition & 1 deletion Modules/ossaudiodev.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* (c) 2000 Peter Bosch. All Rights Reserved.
* (c) 2002 Gregory P. Ward. All Rights Reserved.
* (c) 2002 Python Software Foundation. All Rights Reserved.
* (c) 2017 Python Software Foundation. All Rights Reserved.
*
* XXX need a license statement
*
Expand Down
2 changes: 1 addition & 1 deletion PC/python_ver_rc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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-2017 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 README
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ Copyright and License Information
---------------------------------

Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
2012, 2013, 2014, 2015, 2016 Python Software Foundation. All rights reserved.
2012, 2013, 2014, 2015, 2016, 2017 Python Software Foundation. All rights reserved.

Copyright (c) 2000 BeOpen.com. All rights reserved.

Expand Down