[Python-checkins] r77390 - in python/branches/release31-maint: Doc/c-api/init.rst Doc/using/windows.rst Lib/email/generator.py Lib/email/test/test_email.py Lib/email/utils.py Lib/idlelib/NEWS.txt Lib/logging/__init__.py Lib/platform.py Lib/test/test_hashlib.py Lib/test/test_logging.py Lib/test/test_urllib.py Lib/turtle.py Mac/Resources/app/Info.plist.in Modules/_hashopenssl.c
benjamin.peterson
python-checkins at python.org
Sat Jan 9 19:48:47 CET 2010
Author: benjamin.peterson
Date: Sat Jan 9 19:48:46 2010
New Revision: 77390
Log:
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
........
................
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Doc/c-api/init.rst
python/branches/release31-maint/Doc/using/windows.rst
python/branches/release31-maint/Lib/email/generator.py
python/branches/release31-maint/Lib/email/test/test_email.py
python/branches/release31-maint/Lib/email/utils.py
python/branches/release31-maint/Lib/idlelib/NEWS.txt
python/branches/release31-maint/Lib/logging/__init__.py
python/branches/release31-maint/Lib/platform.py
python/branches/release31-maint/Lib/test/test_hashlib.py
python/branches/release31-maint/Lib/test/test_logging.py
python/branches/release31-maint/Lib/test/test_urllib.py
python/branches/release31-maint/Lib/turtle.py
python/branches/release31-maint/Mac/Resources/app/Info.plist.in
python/branches/release31-maint/Modules/_hashopenssl.c
Modified: python/branches/release31-maint/Doc/c-api/init.rst
==============================================================================
--- python/branches/release31-maint/Doc/c-api/init.rst (original)
+++ python/branches/release31-maint/Doc/c-api/init.rst Sat Jan 9 19:48:46 2010
@@ -256,14 +256,15 @@
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
Modified: python/branches/release31-maint/Doc/using/windows.rst
==============================================================================
--- python/branches/release31-maint/Doc/using/windows.rst (original)
+++ python/branches/release31-maint/Doc/using/windows.rst Sat Jan 9 19:48:46 2010
@@ -166,12 +166,13 @@
.. ``
-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
Modified: python/branches/release31-maint/Lib/email/generator.py
==============================================================================
--- python/branches/release31-maint/Lib/email/generator.py (original)
+++ python/branches/release31-maint/Lib/email/generator.py Sat Jan 9 19:48:46 2010
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2007 Python Software Foundation
+# Copyright (C) 2001-2010 Python Software Foundation
# Author: Barry Warsaw
# Contact: email-sig at python.org
Modified: python/branches/release31-maint/Lib/email/test/test_email.py
==============================================================================
--- python/branches/release31-maint/Lib/email/test/test_email.py (original)
+++ python/branches/release31-maint/Lib/email/test/test_email.py Sat Jan 9 19:48:46 2010
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2007 Python Software Foundation
+# Copyright (C) 2001-2010 Python Software Foundation
# Contact: email-sig at python.org
# email package unit tests
Modified: python/branches/release31-maint/Lib/email/utils.py
==============================================================================
--- python/branches/release31-maint/Lib/email/utils.py (original)
+++ python/branches/release31-maint/Lib/email/utils.py Sat Jan 9 19:48:46 2010
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2009 Python Software Foundation
+# Copyright (C) 2001-2010 Python Software Foundation
# Author: Barry Warsaw
# Contact: email-sig at python.org
Modified: python/branches/release31-maint/Lib/idlelib/NEWS.txt
==============================================================================
--- python/branches/release31-maint/Lib/idlelib/NEWS.txt (original)
+++ python/branches/release31-maint/Lib/idlelib/NEWS.txt Sat Jan 9 19:48:46 2010
@@ -28,7 +28,7 @@
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.
Modified: python/branches/release31-maint/Lib/logging/__init__.py
==============================================================================
--- python/branches/release31-maint/Lib/logging/__init__.py (original)
+++ python/branches/release31-maint/Lib/logging/__init__.py Sat Jan 9 19:48:46 2010
@@ -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!
"""
Modified: python/branches/release31-maint/Lib/platform.py
==============================================================================
--- python/branches/release31-maint/Lib/platform.py (original)
+++ python/branches/release31-maint/Lib/platform.py Sat Jan 9 19:48:46 2010
@@ -89,7 +89,7 @@
__copyright__ = """
Copyright (c) 1999-2000, Marc-Andre Lemburg; mailto:mal at lemburg.com
- Copyright (c) 2000-2008, eGenix.com Software GmbH; mailto:info at egenix.com
+ Copyright (c) 2000-2010, eGenix.com Software GmbH; mailto:info at 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,
Modified: python/branches/release31-maint/Lib/test/test_hashlib.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_hashlib.py (original)
+++ python/branches/release31-maint/Lib/test/test_hashlib.py Sat Jan 9 19:48:46 2010
@@ -2,7 +2,7 @@
#
# $Id$
#
-# Copyright (C) 2005-2009 Gregory P. Smith (greg at krypto.org)
+# Copyright (C) 2005-2010 Gregory P. Smith (greg at krypto.org)
# Licensed to PSF under a Contributor Agreement.
#
Modified: python/branches/release31-maint/Lib/test/test_logging.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_logging.py (original)
+++ python/branches/release31-maint/Lib/test/test_logging.py Sat Jan 9 19:48:46 2010
@@ -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
Modified: python/branches/release31-maint/Lib/test/test_urllib.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_urllib.py (original)
+++ python/branches/release31-maint/Lib/test/test_urllib.py Sat Jan 9 19:48:46 2010
@@ -119,6 +119,10 @@
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
Modified: python/branches/release31-maint/Lib/turtle.py
==============================================================================
--- python/branches/release31-maint/Lib/turtle.py (original)
+++ python/branches/release31-maint/Lib/turtle.py Sat Jan 9 19:48:46 2010
@@ -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 at aon.at
#
# This software is provided 'as-is', without any express or implied
Modified: python/branches/release31-maint/Mac/Resources/app/Info.plist.in
==============================================================================
--- python/branches/release31-maint/Mac/Resources/app/Info.plist.in (original)
+++ python/branches/release31-maint/Mac/Resources/app/Info.plist.in Sat Jan 9 19:48:46 2010
@@ -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>
Modified: python/branches/release31-maint/Modules/_hashopenssl.c
==============================================================================
--- python/branches/release31-maint/Modules/_hashopenssl.c (original)
+++ python/branches/release31-maint/Modules/_hashopenssl.c Sat Jan 9 19:48:46 2010
@@ -1,7 +1,7 @@
/* Module that wraps all OpenSSL hash algorithms */
/*
- * Copyright (C) 2005-2009 Gregory P. Smith (greg at krypto.org)
+ * Copyright (C) 2005-2010 Gregory P. Smith (greg at krypto.org)
* Licensed to PSF under a Contributor Agreement.
*
* Derived from a skeleton of shamodule.c containing work performed by:
More information about the Python-checkins
mailing list