mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merged revisions 65659,65693,65700,65702,65706-65707,65761 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65659 | martin.v.loewis | 2008-08-12 15:45:21 -0500 (Tue, 12 Aug 2008) | 2 lines

  Add Hirokazu Yamamoto.
........
  r65693 | georg.brandl | 2008-08-15 13:35:09 -0500 (Fri, 15 Aug 2008) | 2 lines

  #3558: Attribute reference binds more tightly than subscription and call.
........
  r65700 | antoine.pitrou | 2008-08-15 16:03:21 -0500 (Fri, 15 Aug 2008) | 3 lines

  #2676: email/message.py [Message.get_content_type]: Trivial regex hangs on pathological input
........
  r65702 | gregory.p.smith | 2008-08-15 18:14:00 -0500 (Fri, 15 Aug 2008) | 2 lines

  document that waitpid raises OSError
........
  r65706 | benjamin.peterson | 2008-08-15 22:02:41 -0500 (Fri, 15 Aug 2008) | 1 line

  fix markup
........
  r65707 | benjamin.peterson | 2008-08-15 22:13:07 -0500 (Fri, 15 Aug 2008) | 1 line

  note how os.utime should be used for emulating touch
........
  r65761 | antoine.pitrou | 2008-08-17 08:06:29 -0500 (Sun, 17 Aug 2008) | 3 lines

  fix ZipFile.testzip() to work with very large embedded files
........
This commit is contained in:
Benjamin Peterson 2008-08-17 20:23:46 +00:00
parent 9209138ff9
commit 4cd6a95dfe
6 changed files with 40 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Doc/library/os.rst
View file

@ -1076,15 +1076,16 @@ Files and Directories
.. function:: utime(path, times)
Set the access and modified times of the file specified by *path*. If *times* is
``None``, then the file's access and modified times are set to the current time.
Otherwise, *times* must be a 2-tuple of numbers, of the form ``(atime, mtime)``
which is used to set the access and modified times, respectively. Whether a
directory can be given for *path* depends on whether the operating system
implements directories as files (for example, Windows does not). Note that the
exact times you set here may not be returned by a subsequent :func:`stat` call,
depending on the resolution with which your operating system records access and
modification times; see :func:`stat`.
Set the access and modified times of the file specified by *path*. If *times*
is ``None``, then the file's access and modified times are set to the current
time. (The effect is similar to running the Unix program :program:`touch` on
the path.) Otherwise, *times* must be a 2-tuple of numbers, of the form
``(atime, mtime)`` which is used to set the access and modified times,
respectively. Whether a directory can be given for *path* depends on whether
the operating system implements directories as files (for example, Windows
does not). Note that the exact times you set here may not be returned by a
subsequent :func:`stat` call, depending on the resolution with which your
operating system records access and modification times; see :func:`stat`.
Availability: Macintosh, Unix, Windows.
@ -1596,6 +1597,9 @@ written in Python, such as a mail server's external command delivery program.
``-1``, status is requested for any process in the process group ``-pid`` (the
absolute value of *pid*).
An :exc:`OSError` is raised with the value of errno when the syscall
returns -1.
On Windows: Wait for completion of a process given by process handle *pid*, and
return a tuple containing *pid*, and its exit status shifted left by 8 bits
(shifting makes cross-platform use of the function easier). A *pid* less than or