Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 46a9900

Browse files
benjaminpbenjaminp
committed
Merged revisions 77209,77229,77359-77360,77371 via svnmerge from
svn+ssh://[email protected]/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 ........
1 parent 68111a0 commit 46a9900

15 files changed

Lines changed: 34 additions & 28 deletions

File tree

‎Doc/c-api/init.rst‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -256,14 +256,15 @@ Initialization, Finalization, and Threads
256256
triple: module; search; path
257257
single: path (in module sys)
258258

259-
Return the default module search path; this is computed from the program name
260-
(set by :cfunc:`Py_SetProgramName` above) and some environment variables. The
261-
returned string consists of a series of directory names separated by a platform
262-
dependent delimiter character. The delimiter character is ``':'`` on Unix and
263-
Mac OS X, ``';'`` on Windows. The returned string points into static storage;
264-
the caller should not modify its value. The value is available to Python code
265-
as the list ``sys.path``, which may be modified to change the future search path
266-
for loaded modules.
259+
Return the default module search path; this is computed from the program name
260+
(set by :cfunc:`Py_SetProgramName` above) and some environment variables.
261+
The returned string consists of a series of directory names separated by a
262+
platform dependent delimiter character. The delimiter character is ``':'``
263+
on Unix and Mac OS X, ``';'`` on Windows. The returned string points into
264+
static storage; the caller should not modify its value. The list
265+
:data:`sys.path` is initialized with this value on interpreter startup; it
266+
can be (and usually is) modified later to change the search path for loading
267+
modules.
267268

268269
.. XXX should give the exact rules
269270

‎Doc/using/windows.rst‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,13 @@ separated by semicolons, though, to distinguish them from drive identifiers
166166

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

176177

177178
Executing scripts

‎Lib/email/generator.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2007 Python Software Foundation
1+
# Copyright (C) 2001-2010 Python Software Foundation
22
# Author: Barry Warsaw
33
# Contact: [email protected]
44

‎Lib/email/test/test_email.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2007 Python Software Foundation
1+
# Copyright (C) 2001-2010 Python Software Foundation
22
# Contact: [email protected]
33
# email package unit tests
44

‎Lib/email/utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2009 Python Software Foundation
1+
# Copyright (C) 2001-2010 Python Software Foundation
22
# Author: Barry Warsaw
33
# Contact: [email protected]
44

‎Lib/idlelib/NEWS.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ What's New in IDLE 3.1a1?
2828
What's New in IDLE 2.7? (UNRELEASED, but merged into 3.1 releases above.)
2929
=======================
3030

31-
*Release date: XX-XXX-2009*
31+
*Release date: XX-XXX-2010*
3232

3333
- idle.py modified and simplified to better support developing experimental
3434
versions of IDLE which are not installed in the standard location.

‎Lib/logging/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
Logging package for Python. Based on PEP 282 and comments thereto in
1919
comp.lang.python, and influenced by Apache's log4j system.
2020
21-
Copyright (C) 2001-2009 Vinay Sajip. All Rights Reserved.
21+
Copyright (C) 2001-2010 Vinay Sajip. All Rights Reserved.
2222
2323
To use, simply 'import logging' and log away!
2424
"""

‎Lib/platform.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090

9191
__copyright__ = """
9292
Copyright (c) 1999-2000, Marc-Andre Lemburg; mailto:[email protected]
93-
Copyright (c) 2000-2009, eGenix.com Software GmbH; mailto:[email protected]
93+
Copyright (c) 2000-2010, eGenix.com Software GmbH; mailto:[email protected]
9494
9595
Permission to use, copy, modify, and distribute this software and its
9696
documentation for any purpose and without fee or royalty is hereby granted,

‎Lib/test/test_hashlib.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# $Id$
44
#
5-
# Copyright (C) 2005-2009 Gregory P. Smith ([email protected])
5+
# Copyright (C) 2005-2010 Gregory P. Smith ([email protected])
66
# Licensed to PSF under a Contributor Agreement.
77
#
88

‎Lib/test/test_logging.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python
22
#
3-
# Copyright 2001-2009 by Vinay Sajip. All Rights Reserved.
3+
# Copyright 2001-2010 by Vinay Sajip. All Rights Reserved.
44
#
55
# Permission to use, copy, modify, and distribute this software and its
66
# documentation for any purpose and without fee is hereby granted,
@@ -18,7 +18,7 @@
1818

1919
"""Test harness for the logging module. Run all tests.
2020
21-
Copyright (C) 2001-2009 Vinay Sajip. All Rights Reserved.
21+
Copyright (C) 2001-2010 Vinay Sajip. All Rights Reserved.
2222
"""
2323

2424
import logging

0 commit comments

Comments
 (0)