mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-07 07:31:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merged revisions 77209,77229,77359-77360,77371 via svnmerge from

Browse source 
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
........
This commit is contained in:
Benjamin Peterson 2010-01-09 18:45:30 +00:00
parent 68111a04b0
commit 46a9900e09
15 changed files with 34 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Doc/c-api/init.rst
View file

@ -256,14 +256,15 @@ Initialization, Finalization, and Threads
triple: module; search; path triple: module; search; path
single: path (in module sys) single: path (in module sys)
Return the default module search path; this is computed from the program name Return the default module search path; this is computed from the program name
(set by :cfunc:`Py_SetProgramName` above) and some environment variables. The (set by :cfunc:`Py_SetProgramName` above) and some environment variables.
returned string consists of a series of directory names separated by a platform The returned string consists of a series of directory names separated by a
dependent delimiter character. The delimiter character is ``':'`` on Unix and platform dependent delimiter character. The delimiter character is ``':'``
Mac OS X, ``';'`` on Windows. The returned string points into static storage; on Unix and Mac OS X, ``';'`` on Windows. The returned string points into
the caller should not modify its value. The value is available to Python code static storage; the caller should not modify its value. The list
as the list ``sys.path``, which may be modified to change the future search path :data:`sys.path` is initialized with this value on interpreter startup; it
for loaded modules. can be (and usually is) modified later to change the search path for loading
modules.
.. XXX should give the exact rules .. XXX should give the exact rules

13
Doc/using/windows.rst
View file

@ -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: Modifying the module search path can also be done through the Windows registry
Edit under the key :file:`HKLM\\SOFTWARE\\Python\\PythonCore\\{version}\\PythonPath`.
:file:`HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\{version}\\PythonPath\\`, Subkeys which have semicolon-delimited path strings as their default value will
as described above for the environment variable :envvar:`%PYTHONPATH%`. A cause each path to be searched. Multiple subkeys can be created and are
convenient registry editor is :program:`regedit` (start it by typing "regedit" appended to the path in alphabetical order. A convenient registry editor is
into :menuselection:`Start --> Run`). :program:`regedit` (start it by typing "regedit" into :menuselection:`Start -->
Run`).
Executing scripts Executing scripts

2
Lib/email/generator.py
View file

@ -1,4 +1,4 @@
# Copyright (C) 2001-2007 Python Software Foundation # Copyright (C) 2001-2010 Python Software Foundation
# Author: Barry Warsaw # Author: Barry Warsaw
# Contact: email-sig@python.org # Contact: email-sig@python.org

2
Lib/email/test/test_email.py
View file

@ -1,4 +1,4 @@
# Copyright (C) 2001-2007 Python Software Foundation # Copyright (C) 2001-2010 Python Software Foundation
# Contact: email-sig@python.org # Contact: email-sig@python.org
# email package unit tests # email package unit tests

2
Lib/email/utils.py
View file

@ -1,4 +1,4 @@
# Copyright (C) 2001-2009 Python Software Foundation # Copyright (C) 2001-2010 Python Software Foundation
# Author: Barry Warsaw # Author: Barry Warsaw
# Contact: email-sig@python.org # Contact: email-sig@python.org

2
Lib/idlelib/NEWS.txt
View file

@ -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.) 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 - idle.py modified and simplified to better support developing experimental
versions of IDLE which are not installed in the standard location. versions of IDLE which are not installed in the standard location.

2
Lib/logging/__init__.py
View file

@ -18,7 +18,7 @@
Logging package for Python. Based on PEP 282 and comments thereto in Logging package for Python. Based on PEP 282 and comments thereto in
comp.lang.python, and influenced by Apache's log4j system. 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! To use, simply 'import logging' and log away!
""" """

2
Lib/platform.py
View file

@ -90,7 +90,7 @@
__copyright__ = """ __copyright__ = """
Copyright (c) 1999-2000, Marc-Andre Lemburg; mailto:mal@lemburg.com 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 Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee or royalty is hereby granted, documentation for any purpose and without fee or royalty is hereby granted,

2
Lib/test/test_hashlib.py
View file

@ -2,7 +2,7 @@
# #
# $Id$ # $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. # Licensed to PSF under a Contributor Agreement.
# #

4
Lib/test/test_logging.py
View file

@ -1,6 +1,6 @@
#!/usr/bin/env python #!/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 # Permission to use, copy, modify, and distribute this software and its
# documentation for any purpose and without fee is hereby granted, # documentation for any purpose and without fee is hereby granted,
@ -18,7 +18,7 @@
"""Test harness for the logging module. Run all tests. """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 import logging

4
Lib/test/test_urllib.py
View file

@ -119,6 +119,10 @@ class ProxyTests(unittest.TestCase):
def setUp(self): def setUp(self):
# Records changes to env vars # Records changes to env vars
self.env = support.EnvironmentVarGuard() 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): def tearDown(self):
# Restore all proxy related env vars # Restore all proxy related env vars

2
Lib/turtle.py
View file

@ -2,7 +2,7 @@
# turtle.py: a Tkinter based turtle graphics module for Python # turtle.py: a Tkinter based turtle graphics module for Python
# Version 1.1b - 4. 5. 2009 # Version 1.1b - 4. 5. 2009
# #
# Copyright (C) 2006 - 2009 Gregor Lingl # Copyright (C) 2006 - 2010 Gregor Lingl
# email: glingl@aon.at # email: glingl@aon.at
# #
# This software is provided 'as-is', without any express or implied # This software is provided 'as-is', without any express or implied

2
Lib/unittest/__init__.py
View file

@ -27,7 +27,7 @@ Further information is available in the bundled documentation, and from
http://docs.python.org/library/unittest.html http://docs.python.org/library/unittest.html
Copyright (c) 1999-2003 Steve Purcell 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 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 it under the same terms as Python itself, so long as this copyright message
and disclaimer are retained in their original form. and disclaimer are retained in their original form.

4
Mac/Resources/app/Info.plist.in
View file

@ -20,7 +20,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>Python</string> <string>Python</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>%version%, (c) 2004-2009 Python Software Foundation.</string> <string>%version%, (c) 2004-2010 Python Software Foundation.</string>
<key>CFBundleHelpBookFolder</key> <key>CFBundleHelpBookFolder</key>
<array> <array>
<string>Documentation</string> <string>Documentation</string>
@ -37,7 +37,7 @@
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>
<string>%version%, (c) 2004-2009 Python Software Foundation.</string> <string>%version%, (c) 2004-2010 Python Software Foundation.</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>Python</string> <string>Python</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>

2
Modules/_hashopenssl.c
View file

@ -1,7 +1,7 @@
/* Module that wraps all OpenSSL hash algorithms */ /* 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. * Licensed to PSF under a Contributor Agreement.
* *
* Derived from a skeleton of shamodule.c containing work performed by: * Derived from a skeleton of shamodule.c containing work performed by: