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

merge 3.3

This commit is contained in:
Benjamin Peterson 2012-12-31 21:37:30 -06:00
parent 0485314305 198399d92c
commit ae2039e62c
5 changed files with 6 additions and 6 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-2012 Python Software Foundation. All rights reserved. Copyright © 2001-2013 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

@ -152,7 +152,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-2012 Python Software Foundation; All Rights copyright, i.e., "Copyright © 2001-2013 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.

4
LICENSE
View File

@ -111,8 +111,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 Python Software Foundation; All Rights Reserved" are retained in Python 2011, 2012, 2013 Python Software Foundation; All Rights Reserved" are retained
alone or in any derivative version prepared by Licensee. 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
Python/getcopyright.c
View File

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