languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-10-14 11:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge 3.4

Browse source
This commit is contained in:
Benjamin Peterson 2014-12-31 18:11:34 -06:00
parent 0396cd7067 a453749a78
commit 52074ac866
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Doc/copyright.rst
View file

@ -4,7 +4,7 @@ Copyright
Python and this documentation is: Python and this documentation is:
Copyright © 2001-2014 Python Software Foundation. All rights reserved. Copyright © 2001-2015 Python Software Foundation. All rights reserved.
Copyright © 2000 BeOpen.com. All rights reserved. Copyright © 2000 BeOpen.com. All rights reserved.

2
Doc/license.rst
View file

@ -84,7 +84,7 @@ Terms and conditions for accessing or otherwise using Python
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-2014 Python Software Foundation; All copyright, i.e., "Copyright © 2001-2015 Python Software Foundation; All
Rights Reserved" are retained in Python |release| alone or in any derivative Rights Reserved" are retained in Python |release| alone or in any derivative
version prepared by Licensee. version prepared by Licensee.

4
LICENSE
View file

@ -74,8 +74,8 @@ 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 Python Software Foundation; All Rights Reserved" are 2011, 2012, 2013, 2014, 2015 Python Software Foundation; All Rights Reserved"
retained in Python alone or in any derivative version prepared by Licensee. 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 3. In the event Licensee prepares a derivative work that is based on
or incorporates Python or any part thereof, and wants to make or incorporates Python or any part thereof, and wants to make

2
PC/python_nt.rc
View file

@ -61,7 +61,7 @@ BEGIN
VALUE "FileDescription", "Python Core\0" VALUE "FileDescription", "Python Core\0"
VALUE "FileVersion", PYTHON_VERSION VALUE "FileVersion", PYTHON_VERSION
VALUE "InternalName", "Python DLL\0" VALUE "InternalName", "Python DLL\0"
VALUE "LegalCopyright", "Copyright © 2001-2014 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0" VALUE "LegalCopyright", "Copyright © 2001-2015 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0"
VALUE "OriginalFilename", PYTHON_DLL_NAME "\0" VALUE "OriginalFilename", PYTHON_DLL_NAME "\0"
VALUE "ProductName", "Python\0" VALUE "ProductName", "Python\0"
VALUE "ProductVersion", PYTHON_VERSION VALUE "ProductVersion", PYTHON_VERSION

2
Python/getcopyright.c
View file

@ -4,7 +4,7 @@
static const char cprt[] = static const char cprt[] =
"\ "\
Copyright (c) 2001-2014 Python Software Foundation.\n\ Copyright (c) 2001-2015 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\

2
README
View file

@ -2,7 +2,7 @@ This is Python version 3.5.0 alpha 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 Python Software Foundation. All rights reserved. 2012, 2013, 2014, 2015 Python Software Foundation. All rights reserved.
Python 3.x is a new version of the language, which is incompatible with the 2.x 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, especially line of releases. The language is mostly the same, but many details, especially