summaryrefslogtreecommitdiffstats
path: root/Lib/unittest
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-01-09 18:45:30 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-01-09 18:45:30 (GMT)
commit46a9900e099a82cda7328b0de16d6fffe52ee62a (patch)
treedd4c8c8452493e0e3523d275a00e5c7d5a999ef7 /Lib/unittest
parent68111a04b01f5fd8d2b65dd3021f35497d52ba46 (diff)
downloadcpython-46a9900e099a82cda7328b0de16d6fffe52ee62a.zip
cpython-46a9900e099a82cda7328b0de16d6fffe52ee62a.tar.gz
cpython-46a9900e099a82cda7328b0de16d6fffe52ee62a.tar.bz2
Merged revisions 77209,77229,77359-77360,77371 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r77209 | georg.brandl | 2010-01-01 07:07:05 -0600 (Fri, 01 Jan 2010) | 1 line More yearly updates. ........ r77229 | georg.brandl | 2010-01-02 06:35:01 -0600 (Sat, 02 Jan 2010) | 1 line Fix casing. ........ r77359 | georg.brandl | 2010-01-07 14:54:45 -0600 (Thu, 07 Jan 2010) | 1 line Fix description for Py_GetPath(); it sounded like it always returned sys.path. ........ r77360 | georg.brandl | 2010-01-07 15:48:47 -0600 (Thu, 07 Jan 2010) | 1 line #7653: clarify how the PythonPath registry key should look like. ........ r77371 | senthil.kumaran | 2010-01-08 13:20:25 -0600 (Fri, 08 Jan 2010) | 3 lines Fix for Issue7026. For the Error - RuntimeError: dictionary changed size during iteration ........
Diffstat (limited to 'Lib/unittest')
-rw-r--r--Lib/unittest/__init__.py2
1 files changed, 1 insertions, 1 deletions
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.