From ffeda291153942f643f2a73c6f1dde563c614e42 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sat, 9 Jan 2010 18:48:46 +0000 Subject: [PATCH] Merged revisions 77389 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77389 | benjamin.peterson | 2010-01-09 12:45:30 -0600 (Sat, 09 Jan 2010) | 25 lines 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 ........ ................ --- Doc/c-api/init.rst | 17 +++++++++-------- Doc/using/windows.rst | 13 +++++++------ Lib/email/generator.py | 2 +- Lib/email/test/test_email.py | 2 +- Lib/email/utils.py | 2 +- Lib/idlelib/NEWS.txt | 2 +- Lib/logging/__init__.py | 2 +- Lib/platform.py | 2 +- Lib/test/test_hashlib.py | 2 +- Lib/test/test_logging.py | 4 ++-- Lib/test/test_urllib.py | 4 ++++ Lib/turtle.py | 2 +- Mac/Resources/app/Info.plist.in | 4 ++-- Modules/_hashopenssl.c | 2 +- 14 files changed, 33 insertions(+), 27 deletions(-) diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst index dfed0c9e5e3..1a0975a71e0 100644 --- a/Doc/c-api/init.rst +++ b/Doc/c-api/init.rst @@ -256,14 +256,15 @@ Initialization, Finalization, and Threads triple: module; search; path single: path (in module sys) - Return the default module search path; this is computed from the program name - (set by :cfunc:`Py_SetProgramName` above) and some environment variables. The - returned string consists of a series of directory names separated by a platform - dependent delimiter character. The delimiter character is ``':'`` on Unix and - Mac OS X, ``';'`` on Windows. The returned string points into static storage; - the caller should not modify its value. The value is available to Python code - as the list ``sys.path``, which may be modified to change the future search path - for loaded modules. + Return the default module search path; this is computed from the program name + (set by :cfunc:`Py_SetProgramName` above) and some environment variables. + The returned string consists of a series of directory names separated by a + platform dependent delimiter character. The delimiter character is ``':'`` + on Unix and Mac OS X, ``';'`` on Windows. The returned string points into + static storage; the caller should not modify its value. The list + :data:`sys.path` is initialized with this value on interpreter startup; it + can be (and usually is) modified later to change the search path for loading + modules. .. XXX should give the exact rules diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst index 7c61703e7fc..9571a189651 100644 --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -166,12 +166,13 @@ separated by semicolons, though, to distinguish them from drive identifiers .. `` -Modifying the module search path can also be done through the Windows registry: -Edit -:file:`HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\{version}\\PythonPath\\`, -as described above for the environment variable :envvar:`%PYTHONPATH%`. A -convenient registry editor is :program:`regedit` (start it by typing "regedit" -into :menuselection:`Start --> Run`). +Modifying the module search path can also be done through the Windows registry +under the key :file:`HKLM\\SOFTWARE\\Python\\PythonCore\\{version}\\PythonPath`. +Subkeys which have semicolon-delimited path strings as their default value will +cause each path to be searched. Multiple subkeys can be created and are +appended to the path in alphabetical order. A convenient registry editor is +:program:`regedit` (start it by typing "regedit" into :menuselection:`Start --> +Run`). Executing scripts diff --git a/Lib/email/generator.py b/Lib/email/generator.py index 2b4d182cf7d..e821d00a339 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 25885c76b88..4ffc8f9b2ce 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 7e63ae48a8b..5f40bac174b 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 573f45ffcac..24629c1eded 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 fecca2b14c5..80651415841 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 13129d56fb4..737198fcbfc 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -89,7 +89,7 @@ __copyright__ = """ Copyright (c) 1999-2000, Marc-Andre Lemburg; mailto:mal@lemburg.com - Copyright (c) 2000-2008, 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 d0ad07d82e4..36c7f475aed 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 aff0ce3a678..05751490f2f 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 cae3619138d..ad0c1000034 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 a58e65e03c0..1355d564adb 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/Mac/Resources/app/Info.plist.in b/Mac/Resources/app/Info.plist.in index bd4a54c290c..83d1b26a014 100644 --- a/Mac/Resources/app/Info.plist.in +++ b/Mac/Resources/app/Info.plist.in @@ -20,7 +20,7 @@ CFBundleExecutable Python CFBundleGetInfoString - %version%, (c) 2004-2009 Python Software Foundation. + %version%, (c) 2004-2010 Python Software Foundation. CFBundleHelpBookFolder Documentation @@ -37,7 +37,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - %version%, (c) 2004-2009 Python Software Foundation. + %version%, (c) 2004-2010 Python Software Foundation. CFBundleName Python CFBundlePackageType diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c index ae743946b16..0850d7b8a49 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: