diff options
| -rw-r--r-- | Doc/library/atexit.rst | 4 | ||||
| -rw-r--r-- | Doc/library/os.path.rst | 16 | ||||
| -rw-r--r-- | Tools/README | 7 |
3 files changed, 14 insertions, 13 deletions
diff --git a/Doc/library/atexit.rst b/Doc/library/atexit.rst index 8d5bbab..eab8cd9 100644 --- a/Doc/library/atexit.rst +++ b/Doc/library/atexit.rst @@ -20,8 +20,8 @@ interpreter termination. <http://svn.python.org/view/python/branches/release27-maint/Lib/atexit.py?view=markup>`_ 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 aebde0c..4867e8b 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 6288348..1fb0103 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). |