summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-01-01 13:07:05 (GMT)
committerGeorg Brandl <georg@python.org>2010-01-01 13:07:05 (GMT)
commit8cdc9bc9018af92faef452c4364421a1c77a029d (patch)
tree02ceaa35e892ae8b60b95ade8b13c3f9e03ea3a0
parent9db77468bc581b9c32e03a7190d7d502c7522f77 (diff)
downloadcpython-8cdc9bc9018af92faef452c4364421a1c77a029d.zip
cpython-8cdc9bc9018af92faef452c4364421a1c77a029d.tar.gz
cpython-8cdc9bc9018af92faef452c4364421a1c77a029d.tar.bz2
More yearly updates.
-rw-r--r--Lib/email/generator.py2
-rw-r--r--Lib/email/test/test_email.py2
-rw-r--r--Lib/email/utils.py2
-rw-r--r--Lib/idlelib/NEWS.txt2
-rw-r--r--Lib/lib-tk/turtle.py2
-rw-r--r--Lib/logging/__init__.py2
-rwxr-xr-xLib/platform.py2
-rw-r--r--Lib/test/test_hashlib.py2
-rw-r--r--Lib/test/test_logging.py4
-rw-r--r--Lib/unittest/__init__.py2
-rw-r--r--Mac/Resources/app/Info.plist.in4
-rw-r--r--Modules/_hashopenssl.c2
12 files changed, 14 insertions, 14 deletions
diff --git a/Lib/email/generator.py b/Lib/email/generator.py
index 594a257..77d44be 100644
--- a/Lib/email/generator.py
+++ b/Lib/email/generator.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2009 Python Software Foundation
+# Copyright (C) 2001-2010 Python Software Foundation
# Contact: email-sig@python.org
"""Classes to generate plain text from a message object tree."""
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index 50d3fb6..5aa8463 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2009 Python Software Foundation
+# Copyright (C) 2001-2010 Python Software Foundation
# Contact: email-sig@python.org
# email package unit tests
diff --git a/Lib/email/utils.py b/Lib/email/utils.py
index 87979dc..b9a7642 100644
--- a/Lib/email/utils.py
+++ b/Lib/email/utils.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2009 Python Software Foundation
+# Copyright (C) 2001-2010 Python Software Foundation
# Author: Barry Warsaw
# Contact: email-sig@python.org
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index fee9c61..25318e1 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -1,7 +1,7 @@
What's New in IDLE 2.7a0?
=========================
-*Release date: XX-XXX-2009*
+*Release date: XX-XXX-2010*
- idle.py modified and simplified to better support developing experimental
versions of IDLE which are not installed in the standard location.
diff --git a/Lib/lib-tk/turtle.py b/Lib/lib-tk/turtle.py
index afe5658..e9dba10 100644
--- a/Lib/lib-tk/turtle.py
+++ b/Lib/lib-tk/turtle.py
@@ -2,7 +2,7 @@
# turtle.py: a Tkinter based turtle graphics module for Python
# Version 1.0.1 - 24. 9. 2009
#
-# Copyright (C) 2006 - 2009 Gregor Lingl
+# Copyright (C) 2006 - 2010 Gregor Lingl
# email: glingl@aon.at
#
# This software is provided 'as-is', without any express or implied
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index e0d6281..b5390cc 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -18,7 +18,7 @@
Logging package for Python. Based on PEP 282 and comments thereto in
comp.lang.python, and influenced by Apache's log4j system.
-Copyright (C) 2001-2009 Vinay Sajip. All Rights Reserved.
+Copyright (C) 2001-2010 Vinay Sajip. All Rights Reserved.
To use, simply 'import logging' and log away!
"""
diff --git a/Lib/platform.py b/Lib/platform.py
index 5fda9fb..5df1e23 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -92,7 +92,7 @@
__copyright__ = """
Copyright (c) 1999-2000, Marc-Andre Lemburg; mailto:mal@lemburg.com
- Copyright (c) 2000-2009, eGenix.com Software GmbH; mailto:info@egenix.com
+ Copyright (c) 2000-2010, eGenix.com Software GmbH; mailto:info@egenix.com
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee or royalty is hereby granted,
diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py
index 0183714..7184316 100644
--- a/Lib/test/test_hashlib.py
+++ b/Lib/test/test_hashlib.py
@@ -2,7 +2,7 @@
#
# $Id$
#
-# Copyright (C) 2005-2009 Gregory P. Smith (greg@krypto.org)
+# Copyright (C) 2005-2010 Gregory P. Smith (greg@krypto.org)
# Licensed to PSF under a Contributor Agreement.
#
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 69b13e6..e06a97d 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2001-2009 by Vinay Sajip. All Rights Reserved.
+# Copyright 2001-2010 by Vinay Sajip. All Rights Reserved.
#
# Permission to use, copy, modify, and distribute this software and its
# documentation for any purpose and without fee is hereby granted,
@@ -18,7 +18,7 @@
"""Test harness for the logging module. Run all tests.
-Copyright (C) 2001-2009 Vinay Sajip. All Rights Reserved.
+Copyright (C) 2001-2010 Vinay Sajip. All Rights Reserved.
"""
import logging
diff --git a/Lib/unittest/__init__.py b/Lib/unittest/__init__.py
index 20b307b..e0c64d4 100644
--- a/Lib/unittest/__init__.py
+++ b/Lib/unittest/__init__.py
@@ -27,7 +27,7 @@ Further information is available in the bundled documentation, and from
http://docs.python.org/library/unittest.html
Copyright (c) 1999-2003 Steve Purcell
-Copyright (c) 2003-2009 Python Software Foundation
+Copyright (c) 2003-2010 Python Software Foundation
This module is free software, and you may redistribute it and/or modify
it under the same terms as Python itself, so long as this copyright message
and disclaimer are retained in their original form.
diff --git a/Mac/Resources/app/Info.plist.in b/Mac/Resources/app/Info.plist.in
index bd4a54c..83d1b26 100644
--- a/Mac/Resources/app/Info.plist.in
+++ b/Mac/Resources/app/Info.plist.in
@@ -20,7 +20,7 @@
<key>CFBundleExecutable</key>
<string>Python</string>
<key>CFBundleGetInfoString</key>
- <string>%version%, (c) 2004-2009 Python Software Foundation.</string>
+ <string>%version%, (c) 2004-2010 Python Software Foundation.</string>
<key>CFBundleHelpBookFolder</key>
<array>
<string>Documentation</string>
@@ -37,7 +37,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>%version%, (c) 2004-2009 Python Software Foundation.</string>
+ <string>%version%, (c) 2004-2010 Python Software Foundation.</string>
<key>CFBundleName</key>
<string>Python</string>
<key>CFBundlePackageType</key>
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
index ba18aa2..df4580a 100644
--- a/Modules/_hashopenssl.c
+++ b/Modules/_hashopenssl.c
@@ -1,7 +1,7 @@
/* Module that wraps all OpenSSL hash algorithms */
/*
- * Copyright (C) 2005-2009 Gregory P. Smith (greg@krypto.org)
+ * Copyright (C) 2005-2010 Gregory P. Smith (greg@krypto.org)
* Licensed to PSF under a Contributor Agreement.
*
* Derived from a skeleton of shamodule.c containing work performed by: