traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge 3.5

This commit is contained in:
Benjamin Peterson 2017-01-01 22:08:44 -06:00
parent 5430293fdf 4365833d11
commit 5848e72ee1
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/license.rst
View File

@ -87,7 +87,7 @@ PSF LICENSE AGREEMENT FOR PYTHON |release|
analyze, test, perform and/or display publicly, prepare derivative works, analyze, test, perform and/or display publicly, prepare derivative works,
distribute, and otherwise use Python |release| alone or in any derivative distribute, and otherwise use Python |release| alone or in any derivative
version, provided, however, that PSF's License Agreement and PSF's notice of 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 Reserved" are retained in Python |release| alone or in any derivative version
prepared by Licensee. prepared by Licensee.

2
LICENSE
View File

@ -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, distribute, and otherwise use Python alone or in any derivative version,
provided, however, that PSF's License Agreement and PSF's notice of copyright, 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, 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 Reserved" are retained in Python alone or in any derivative version prepared by
Licensee. Licensee.

2
Mac/PythonLauncher/Info.plist.in
View File

@ -40,7 +40,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>Python Launcher</string> <string>Python Launcher</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>%VERSION%, © 2001-2016 Python Software Foundation</string> <string>%VERSION%, © 2001-2017 Python Software Foundation</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>PythonLauncher.icns</string> <string>PythonLauncher.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>

2
Mac/Resources/app/Info.plist.in
View File

@ -37,7 +37,7 @@
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>
<string>%version%, (c) 2001-2016 Python Software Foundation.</string> <string>%version%, (c) 2001-2017 Python Software Foundation.</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>Python</string> <string>Python</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>

4
Mac/Resources/framework/Info.plist.in
View File

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>%VERSION%, (c) 2001-2016 Python Software Foundation.</string> <string>%VERSION%, (c) 2001-2017 Python Software Foundation.</string>
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>
<string>%VERSION%, (c) 2001-2016 Python Software Foundation.</string> <string>%VERSION%, (c) 2001-2017 Python Software Foundation.</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>

2
Python/getcopyright.c
View File

@ -4,7 +4,7 @@
static const char cprt[] = static const char cprt[] =
"\ "\
Copyright (c) 2001-2016 Python Software Foundation.\n\ Copyright (c) 2001-2017 Python Software Foundation.\n\
All Rights Reserved.\n\ All Rights Reserved.\n\
\n\ \n\
Copyright (c) 2000 BeOpen.com.\n\ Copyright (c) 2000 BeOpen.com.\n\

3
README
View File

@ -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, 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 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, 2.x line of releases. The language is mostly the same, but many details,