[Python-checkins] r86760 - in python/branches/release27-maint: Doc/library/atexit.rst Doc/library/os.path.rst Tools/README
python-checkins at python.org
Fri Nov 26 08:21:01 CET 2010
Date: Fri Nov 26 08:21:01 2010
New Revision: 86760
Merged revisions 85253,85452-85454 via svnmerge from
r85253 | georg.brandl | 2010-10-06 10:52:48 +0200 (Mi, 06 Okt 2010) | 1 line
Copyedit of os.symlink() docs.
r85452 | georg.brandl | 2010-10-14 08:43:22 +0200 (Do, 14 Okt 2010) | 1 line
#10046: small correction to atexit docs.
r85453 | georg.brandl | 2010-10-14 08:46:08 +0200 (Do, 14 Okt 2010) | 1 line
#6825: small correction to split() docs.
r85454 | georg.brandl | 2010-10-14 08:48:47 +0200 (Do, 14 Okt 2010) | 1 line
python/branches/release27-maint/ (props changed)
--- python/branches/release27-maint/Doc/library/atexit.rst (original)
+++ python/branches/release27-maint/Doc/library/atexit.rst Fri Nov 26 08:21:01 2010
@@ -20,8 +20,8 @@
Note: the functions registered via this module are not called when the program
-is killed by a signal, when a Python fatal internal error is detected, or when
-:func:`os._exit` is called.
+is killed by a signal not handled by Python, when a Python fatal internal error
+is detected, or when :func:`os._exit` is called.
.. index:: single: exitfunc (in sys)
--- python/branches/release27-maint/Doc/library/os.path.rst (original)
+++ python/branches/release27-maint/Doc/library/os.path.rst Fri Nov 26 08:21:01 2010
@@ -268,14 +268,14 @@
.. function:: split(path)
- Split the pathname *path* into a pair, ``(head, tail)`` where *tail* is the last
- pathname component and *head* is everything leading up to that. The *tail* part
- will never contain a slash; if *path* ends in a slash, *tail* will be empty. If
- there is no slash in *path*, *head* will be empty. If *path* is empty, both
- *head* and *tail* are empty. Trailing slashes are stripped from *head* unless
- it is the root (one or more slashes only). In nearly all cases, ``join(head,
- tail)`` equals *path* (the only exception being when there were multiple slashes
- separating *head* from *tail*).
+ Split the pathname *path* into a pair, ``(head, tail)`` where *tail* is the
+ last pathname component and *head* is everything leading up to that. The
+ *tail* part will never contain a slash; if *path* ends in a slash, *tail*
+ will be empty. If there is no slash in *path*, *head* will be empty. If
+ *path* is empty, both *head* and *tail* are empty. Trailing slashes are
+ stripped from *head* unless it is the root (one or more slashes only). In
+ all cases, ``join(head, tail)`` returns a path to the same location as *path*
+ (but the strings may differ).
.. function:: splitdrive(path)
--- python/branches/release27-maint/Tools/README (original)
+++ python/branches/release27-maint/Tools/README Fri Nov 26 08:21:01 2010
@@ -30,9 +30,10 @@
pynche A Tkinter-based color editor.
-scripts A number of useful single-file programs, e.g. tabnanny.py
- (by Tim Peters), which checks for inconsistent mixing
- of tabs and spaces.
+scripts A number of useful single-file programs, e.g. tabnanny.py
+ by Tim Peters, which checks for inconsistent mixing of
+ tabs and spaces, and 2to3, which converts Python 2 code
+ to Python 3 code.
unicode Tools used to generate unicode database files for
Python 2.0 (by Fredrik Lundh).
More information about the Python-checkins