diff options
| author | Benjamin Peterson <benjamin@python.org> | 2017-01-01 22:08:33 -0600 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2017-01-01 22:08:33 -0600 |
| commit | 4365833d11fb8e0139d9e8a543692e963a749e38 (patch) | |
| tree | 43a628b6412fd9655529b50258f60a6762618e7d | |
| parent | 4950ae14916e340e5274ce0b8277aec9006bd035 (diff) | |
| parent | b6e2142b0cf96ffd081eff1f4f6d90074efa0ead (diff) | |
| download | cpython-git-4365833d11fb8e0139d9e8a543692e963a749e38.tar.gz | |
merge 3.4
| -rw-r--r-- | Doc/license.rst | 2 | ||||
| -rw-r--r-- | LICENSE | 2 | ||||
| -rw-r--r-- | Mac/PythonLauncher/Info.plist.in | 2 | ||||
| -rw-r--r-- | Mac/Resources/app/Info.plist.in | 2 | ||||
| -rw-r--r-- | Mac/Resources/framework/Info.plist.in | 4 | ||||
| -rw-r--r-- | Python/getcopyright.c | 2 | ||||
| -rw-r--r-- | README | 3 |
7 files changed, 9 insertions, 8 deletions
diff --git a/Doc/license.rst b/Doc/license.rst index 8843116a14..49d29cee31 100644 --- 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-2016 Python Software Foundation; All Rights + copyright, i.e., "Copyright © 2001-2017 Python Software Foundation; All Rights Reserved" are retained in Python |release| alone or in any derivative version prepared by Licensee. @@ -74,7 +74,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 Python Software Foundation; All Rights +2011, 2012, 2013, 2014, 2015, 2016, 2017 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee. diff --git a/Mac/PythonLauncher/Info.plist.in b/Mac/PythonLauncher/Info.plist.in index 4a5eeb5ff5..f1ab79f3d4 100644 --- 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-2016 Python Software Foundation</string> + <string>%VERSION%, © 2001-2017 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 a0bb971046..a23166e6d3 100644 --- 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-2016 Python Software Foundation.</string> + <string>%version%, (c) 2001-2017 Python Software Foundation.</string> <key>CFBundleName</key> <string>Python</string> <key>CFBundlePackageType</key> diff --git a/Mac/Resources/framework/Info.plist.in b/Mac/Resources/framework/Info.plist.in index fcba7d9a88..7a64619e29 100644 --- a/Mac/Resources/framework/Info.plist.in +++ b/Mac/Resources/framework/Info.plist.in @@ -17,9 +17,9 @@ <key>CFBundlePackageType</key> <string>FMWK</string> <key>CFBundleShortVersionString</key> - <string>%VERSION%, (c) 2001-2016 Python Software Foundation.</string> + <string>%VERSION%, (c) 2001-2017 Python Software Foundation.</string> <key>CFBundleLongVersionString</key> - <string>%VERSION%, (c) 2001-2016 Python Software Foundation.</string> + <string>%VERSION%, (c) 2001-2017 Python Software Foundation.</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> diff --git a/Python/getcopyright.c b/Python/getcopyright.c index c3f1e89599..cac647c3ce 100644 --- a/Python/getcopyright.c +++ b/Python/getcopyright.c @@ -4,7 +4,7 @@ static const char cprt[] = "\ -Copyright (c) 2001-2016 Python Software Foundation.\n\ +Copyright (c) 2001-2017 Python Software Foundation.\n\ All Rights Reserved.\n\ \n\ Copyright (c) 2000 BeOpen.com.\n\ @@ -2,7 +2,8 @@ This is Python version 3.5.3 release candidate 1 ================================================ 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. Python 3.x is a new version of the language, which is incompatible with the 2.x line of releases. The language is mostly the same, but many details, |