summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Doc/c-api/init.rst17
-rw-r--r--Doc/using/windows.rst13
-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/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/test/test_urllib.py4
-rw-r--r--Lib/turtle.py2
-rw-r--r--Lib/unittest/__init__.py2
-rw-r--r--Mac/Resources/app/Info.plist.in4
-rw-r--r--Modules/_hashopenssl.c2
15 files changed, 34 insertions, 28 deletions
diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
index 650aec214f..643628e1b0 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 7c61703e7f..9571a18965 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 2b4d182cf7..e821d00a33 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 25885c76b8..4ffc8f9b2c 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 7e63ae48a8..5f40bac174 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 573f45ffca..24629c1ede 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 487a22593d..38b6c7eeaa 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 dd33f4b9c0..0a525871a8 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 652c60e3c8..2857737f03 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 aff0ce3a67..05751490f2 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 cae3619138..ad0c100003 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 a58e65e03c..1355d564ad 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 20b307bbc8..e0c64d4d48 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 bd4a54c290..83d1b26a01 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 ae743946b1..0850d7b8a4 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:
View Lorry Controller Status