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
........

diff --git a/LICENSE b/LICENSE
index 9ce82885dac897b520696899f4a034ce187ad1e7..fb0906f266ccdd48a761bd290b18b946b5400353 100644 (file)
--- 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 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\