summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-01-01 04:55:33 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-01-01 04:55:33 (GMT)
commit370fe530c89f39008ca4deadc8c5f96adf0551f4 (patch)
tree266a75849b5b1761af5d77e9eccd671969262827
parent1e6711b69ecb9837528c619bf1e4ab058917c077 (diff)
downloadcpython-370fe530c89f39008ca4deadc8c5f96adf0551f4.zip
cpython-370fe530c89f39008ca4deadc8c5f96adf0551f4.tar.gz
cpython-370fe530c89f39008ca4deadc8c5f96adf0551f4.tar.bz2
Merged revisions 77206-77207 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77206 | benjamin.peterson | 2010-01-01 06:47:54 +0200 (Fri, 01 Jan 2010) | 9 lines Merged revisions 77203 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77203 | benjamin.peterson | 2009-12-31 22:00:55 -0600 (Thu, 31 Dec 2009) | 1 line update copyright year ........ ................ r77207 | benjamin.peterson | 2010-01-01 06:49:25 +0200 (Fri, 01 Jan 2010) | 9 lines Merged revisions 77204 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77204 | ezio.melotti | 2009-12-31 22:16:42 -0600 (Thu, 31 Dec 2009) | 1 line more copyright year updates ........ ................
-rw-r--r--Doc/copyright.rst2
-rw-r--r--Doc/license.rst2
-rw-r--r--LICENSE6
-rw-r--r--Python/getcopyright.c2
-rw-r--r--README2
5 files changed, 7 insertions, 7 deletions
diff --git a/Doc/copyright.rst b/Doc/copyright.rst
index ec78a38..893b541 100644
--- a/Doc/copyright.rst
+++ b/Doc/copyright.rst
@@ -4,7 +4,7 @@ Copyright
Python and this documentation is:
-Copyright © 2001-2009 Python Software Foundation. All rights reserved.
+Copyright © 2001-2010 Python Software Foundation. All rights reserved.
Copyright © 2000 BeOpen.com. All rights reserved.
diff --git a/Doc/license.rst b/Doc/license.rst
index 6022107..367c91c 100644
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -135,7 +135,7 @@ Terms and conditions for accessing or otherwise using Python
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-2009 Python Software Foundation; All Rights
+ copyright, i.e., "Copyright © 2001-2010 Python Software Foundation; All Rights
Reserved" are retained in Python |release| alone or in any derivative version
prepared by Licensee.
diff --git a/LICENSE b/LICENSE
index 9ce8288..fb0906f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -100,9 +100,9 @@ grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
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 Python
-Software Foundation; All Rights Reserved" are retained in Python alone or in any
-derivative version prepared by Licensee.
+i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Python Software Foundation; All Rights Reserved" 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
or incorporates Python or any part thereof, and wants to make
diff --git a/Python/getcopyright.c b/Python/getcopyright.c
index 8864cdb..a5e7fa6 100644
--- a/Python/getcopyright.c
+++ b/Python/getcopyright.c
@@ -4,7 +4,7 @@
static char cprt[] =
"\
-Copyright (c) 2001-2009 Python Software Foundation.\n\
+Copyright (c) 2001-2010 Python Software Foundation.\n\
All Rights Reserved.\n\
\n\
Copyright (c) 2000 BeOpen.com.\n\
diff --git a/README b/README
index 0fa803d..98981d2 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
This is Python version 3.1.1
============================
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
Python Software Foundation.
All rights reserved.