From: Georg Brandl Date: Fri, 26 Nov 2010 07:21:01 +0000 (+0000) Subject: Merged revisions 85253,85452-85454 via svnmerge from X-Git-Tag: v2.7.1~29 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=420cca92e8b1b5b9bd2b9a58a93d4e8f0ff86d1d;p=python Merged revisions 85253,85452-85454 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ 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 Mention 2to3. ........ --- diff --git a/Doc/library/atexit.rst b/Doc/library/atexit.rst index 8d5bbabac4..eab8cd9cca 100644 --- a/Doc/library/atexit.rst +++ b/Doc/library/atexit.rst @@ -20,8 +20,8 @@ interpreter termination. `_ 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) diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst index aebde0c910..4867e8b211 100644 --- a/Doc/library/os.path.rst +++ b/Doc/library/os.path.rst @@ -268,14 +268,14 @@ write files see :func:`open`, and for accessing the filesystem see the .. 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) diff --git a/Tools/README b/Tools/README index 62883489bd..1fb010358c 100644 --- a/Tools/README +++ b/Tools/README @@ -30,9 +30,10 @@ i18n Tools for internationalization. pygettext.py 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).