Merged revisions 77203-77204 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77203 | benjamin.peterson | 2010-01-01 06:00:55 +0200 (Fri, 01 Jan 2010) | 1 line

  update copyright year
........
  r77204 | ezio.melotti | 2010-01-01 06:16:42 +0200 (Fri, 01 Jan 2010) | 1 line

  more copyright year updates
........

diff --git a/Doc/copyright.rst b/Doc/copyright.rst
index ec78a38c38c2dbc38d22ff1332a82420f18e098a..893b541b2213c0eb59435d9a3293a7b29daf25eb 100644 (file)
--- 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 77ff38e4dc6bfd2613cddb67f2716d84ef596411..34f09ad13536c65def0c53a689e80b5337cbb70f 100644 (file)
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -130,7 +130,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 4ddcf09c2e6e4c8c498ed816dc85b1bc363edac4..064695ea7271f984309ed19014e7b29e9bc8f2a6 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -96,9 +96,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 8864cdbbc0a9ce0b5014b8da49e6087dbce6944a..a5e7fa6396e99e0cbad494d63aea4931eecf444b 100644 (file)
--- 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 ce2bc05c11b3fa10544ab40c9667ec78a2d165cc..0285a6e52bb57f374620952fd430633e562dbd36 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 This is Python version 2.6.4
 ============================
 
-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.