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

diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
index dfed0c9e5e33c0abfef804ca3374f0bd5c367442..1a0975a71e0145116371a7ab7e00355122312e35 100644 (file)
--- 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 7c61703e7fcfa4fbb62d157b22cb428b2dd0af74..9571a189651e0bdec12fc824bfb6621698dc42a1 100644 (file)
--- 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 2b4d182cf7d2eefede62146498c85b5f454dd273..e821d00a3394cef1b52d45c9959bfa7a3466ac13 100644 (file)
--- 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 25885c76b88ccc937b12973f89509d13385ee65d..4ffc8f9b2ceee9833401e6adc08823b46251cb6e 100644 (file)
--- 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 7e63ae48a8bd59c50c531d9cc2310928b6272bb2..5f40bac174bb94fce26025afcc5377b67ba9c8be 100644 (file)
--- 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 573f45ffcac273e1a0abf1038321af71bd64f472..24629c1eded24a9f5791a4efef0111c04b1d9792 100644 (file)
--- 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 fecca2b14c5bfb898a2aac1b55c5fa5b038fc986..806514158416d6e5ad17f134961f9959ad3cb669 100644 (file)
--- 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 13129d56fb48b084dcfab416a8aacdc46dc91218..737198fcbfcd2074f4bc7405500b6a30ceaf3948 100755 (executable)
--- 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 d0ad07d82e44b3786900f54b5bafbd426b2a4d41..36c7f475aed8c4664e006f2152443bd6782870de 100644 (file)
--- 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 aff0ce3a6789140dfb35dff03294755de08f32d7..05751490f2fa47e784d12fb74143e74665173c4c 100644 (file)
--- 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 cae3619138de745a84acc68a7bddc9bf2a7a464d..ad0c10000349f64c3c481e56fa253612eb190b5f 100644 (file)
--- 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 a58e65e03c05851e177a07040cf0c3d70ff9f96f..1355d564adb951a01b0a6c089ef71421bc89160f 100644 (file)
--- 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 bd4a54c290c9702286c7180c4ccd005567c0f870..83d1b26a014e823e06d35f9fedf0becfbfea5666 100644 (file)
--- 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 ae743946b16125d8c3d6bdb110445ec07d9931fe..0850d7b8a49b8499010494e117c206ce3f245fb7 100644 (file)
--- 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: