languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-16 04:09:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge 3.5

Browse source
This commit is contained in:
Benjamin Peterson 2016-01-01 10:25:22 -06:00
parent 288cb25f1a 4c70293755
commit 71db903563
6 changed files with 8 additions and 8 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-2015 Python Software Foundation. All rights reserved. Copyright © 2001-2016 Python Software Foundation. All rights reserved.
Copyright © 2000 BeOpen.com. All rights reserved. Copyright © 2000 BeOpen.com. All rights reserved.

6
Doc/license.rst
View file

@ -84,9 +84,9 @@ 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-2015 Python Software Foundation; All copyright, i.e., "Copyright © 2001-2016 Python Software Foundation; All Rights
Rights Reserved" are retained in Python |release| alone or in any derivative Reserved" are retained in Python |release| alone or in any derivative version
version prepared by Licensee. prepared by Licensee.
#. In the event Licensee prepares a derivative work that is based on or #. In the event Licensee prepares a derivative work that is based on or
incorporates Python |release| or any part thereof, and wants to make the incorporates Python |release| or any part thereof, and wants to make the

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 Python Software Foundation; All Rights Reserved" 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. 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

2
PC/python_ver_rc.h
View file

@ -4,7 +4,7 @@
#include "winver.h" #include "winver.h"
#define PYTHON_COMPANY "Python Software Foundation" #define PYTHON_COMPANY "Python Software Foundation"
#define PYTHON_COPYRIGHT "Copyright \xA9 2001-2015 Python Software Foundation. Copyright \xA9 2000 BeOpen.com. Copyright \xA9 1995-2001 CNRI. Copyright \xA9 1991-1995 SMC." #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 MS_WINDOWS #define MS_WINDOWS
#include "modsupport.h" #include "modsupport.h"

2
Python/getcopyright.c
View file

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