diff options
| author | Benjamin Peterson <benjamin@python.org> | 2017-01-02 04:08:44 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2017-01-02 04:08:44 (GMT) |
| commit | 5848e72ee1f85354b023b19b83c88ba57d39b6d0 (patch) | |
| tree | 49bfa7d58cdebb86c682b2dcce2a4ed152d2c50e | |
| parent | 5430293fdf286b33f2370d15705ee4339c81e82c (diff) | |
| parent | 4365833d11fb8e0139d9e8a543692e963a749e38 (diff) | |
| download | cpython-5848e72ee1f85354b023b19b83c88ba57d39b6d0.zip cpython-5848e72ee1f85354b023b19b83c88ba57d39b6d0.tar.gz cpython-5848e72ee1f85354b023b19b83c88ba57d39b6d0.tar.bz2 | |
merge 3.5
| -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 8843116..49d29ce 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 4a5eeb5..f1ab79f 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 a0bb971..a23166e 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 fcba7d9..7a64619 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 c3f1e89..cac647c 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.6.1 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, |