Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 80897 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80897 | benjamin.peterson | 2010-05-06 18:03:05 -0500 (Thu, 06 May 2010) | 13 lines

  Merged revisions 80894,80896 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80894 | benjamin.peterson | 2010-05-06 17:33:46 -0500 (Thu, 06 May 2010) | 1 line

    Availability gets its own line
  ........
    r80896 | benjamin.peterson | 2010-05-06 17:49:28 -0500 (Thu, 06 May 2010) | 1 line

    ensure that availability information is on its own line at the end of the function docs
  ........
................
This commit is contained in:
Benjamin Peterson 2010-05-06 23:20:40 +00:00
parent 861c0e51b8
commit d91203bcc5
2 changed files with 332 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Doc/library/os.path.rst
View File

@ -223,19 +223,24 @@ applications should use string objects to access all files.
Return a relative filepath to *path* either from the current directory or from Return a relative filepath to *path* either from the current directory or from
an optional *start* point. an optional *start* point.
*start* defaults to :attr:`os.curdir`. Availability: Windows, Unix. *start* defaults to :attr:`os.curdir`.
Availability: Windows, Unix.
.. function:: samefile(path1, path2) .. function:: samefile(path1, path2)
Return ``True`` if both pathname arguments refer to the same file or directory Return ``True`` if both pathname arguments refer to the same file or directory
(as indicated by device number and i-node number). Raise an exception if a (as indicated by device number and i-node number). Raise an exception if a
:func:`os.stat` call on either pathname fails. Availability: Unix. :func:`os.stat` call on either pathname fails.
Availability: Unix.
.. function:: sameopenfile(fp1, fp2) .. function:: sameopenfile(fp1, fp2)
Return ``True`` if the file descriptors *fp1* and *fp2* refer to the same file. Return ``True`` if the file descriptors *fp1* and *fp2* refer to the same file.
Availability: Unix. Availability: Unix.
@ -244,7 +249,9 @@ applications should use string objects to access all files.
Return ``True`` if the stat tuples *stat1* and *stat2* refer to the same file. Return ``True`` if the stat tuples *stat1* and *stat2* refer to the same file.
These structures may have been returned by :func:`fstat`, :func:`lstat`, or These structures may have been returned by :func:`fstat`, :func:`lstat`, or
:func:`stat`. This function implements the underlying comparison used by :func:`stat`. This function implements the underlying comparison used by
:func:`samefile` and :func:`sameopenfile`. Availability: Unix. :func:`samefile` and :func:`sameopenfile`.
Availability: Unix.
.. function:: split(path) .. function:: split(path)
@ -293,7 +300,9 @@ applications should use string objects to access all files.
Split the pathname *path* into a pair ``(unc, rest)`` so that *unc* is the UNC Split the pathname *path* into a pair ``(unc, rest)`` so that *unc* is the UNC
mount point (such as ``r'\\host\mount'``), if present, and *rest* the rest of mount point (such as ``r'\\host\mount'``), if present, and *rest* the rest of
the path (such as ``r'\path\file.ext'``). For paths containing drive letters, the path (such as ``r'\path\file.ext'``). For paths containing drive letters,
*unc* will always be the empty string. Availability: Windows. *unc* will always be the empty string.
Availability: Windows.
.. data:: supports_unicode_filenames .. data:: supports_unicode_filenames

442
Doc/library/os.rst
View File

File diff suppressed because it is too large Load Diff