diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/email/generator.py | 2 | ||||
| -rw-r--r-- | Lib/email/test/test_email.py | 2 | ||||
| -rw-r--r-- | Lib/email/utils.py | 2 | ||||
| -rw-r--r-- | Lib/idlelib/NEWS.txt | 2 | ||||
| -rw-r--r-- | Lib/logging/__init__.py | 2 | ||||
| -rwxr-xr-x | Lib/platform.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_hashlib.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_logging.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_urllib.py | 4 | ||||
| -rw-r--r-- | Lib/turtle.py | 2 | ||||
| -rw-r--r-- | Lib/unittest/__init__.py | 2 |
11 files changed, 15 insertions, 11 deletions
diff --git a/Lib/email/generator.py b/Lib/email/generator.py index 2b4d182..e821d00 100644 --- a/Lib/email/generator.py +++ b/Lib/email/generator.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2007 Python Software Foundation +# Copyright (C) 2001-2010 Python Software Foundation # Author: Barry Warsaw # Contact: email-sig@python.org diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py index 25885c7..4ffc8f9 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2007 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 7e63ae4..5f40bac 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 573f45f..24629c1 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -28,7 +28,7 @@ What's New in IDLE 3.1a1? What's New in IDLE 2.7? (UNRELEASED, but merged into 3.1 releases above.) ======================= -*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/logging/__init__.py b/Lib/logging/__init__.py index 487a225..38b6c7e 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 dd33f4b..0a52587 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -90,7 +90,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 652c60e..2857737 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 aff0ce3..0575149 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/test/test_urllib.py b/Lib/test/test_urllib.py index cae3619..ad0c100 100644 --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -119,6 +119,10 @@ class ProxyTests(unittest.TestCase): def setUp(self): # Records changes to env vars self.env = support.EnvironmentVarGuard() + # Delete all proxy related env vars + for k in os.environ.keys(): + if 'proxy' in k.lower(): + self.env.unset(k) def tearDown(self): # Restore all proxy related env vars diff --git a/Lib/turtle.py b/Lib/turtle.py index a58e65e..1355d56 100644 --- a/Lib/turtle.py +++ b/Lib/turtle.py @@ -2,7 +2,7 @@ # turtle.py: a Tkinter based turtle graphics module for Python # Version 1.1b - 4. 5. 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/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. |