Backout f8409b3d6449: the PEP 410 is not accepted yet
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 3f10a32..06f1452 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -808,16 +808,13 @@
Availability: Unix.
-.. function:: fstat(fd, timestamp=None)
+.. function:: fstat(fd)
Return status for file descriptor *fd*, like :func:`~os.stat`.
Availability: Unix, Windows.
- .. versionchanged:: 3.3
- Added the *timestamp* argument.
-
-.. function:: fstatat(dirfd, path, flags=0, timestamp="float")
+.. function:: fstatat(dirfd, path, flags=0)
Like :func:`stat` but if *path* is relative, it is taken as relative to *dirfd*.
*flags* is optional and may be 0 or :data:`AT_SYMLINK_NOFOLLOW`.
@@ -1699,7 +1696,7 @@
.. versionadded:: 3.3
-.. function:: lstat(path, timestamp=None)
+.. function:: lstat(path)
Perform the equivalent of an :c:func:`lstat` system call on the given path.
Similar to :func:`~os.stat`, but does not follow symbolic links. On
@@ -1709,9 +1706,6 @@
.. versionchanged:: 3.2
Added support for Windows 6.0 (Vista) symbolic links.
- .. versionchanged:: 3.3
- The *timestamp* argument was added.
-
.. function:: lutimes(path[, times])
@@ -1975,7 +1969,7 @@
.. versionadded:: 3.3
-.. function:: stat(path, timestamp=None)
+.. function:: stat(path)
Perform the equivalent of a :c:func:`stat` system call on the given path.
(This function follows symlinks; to stat a symlink use :func:`lstat`.)
@@ -1995,11 +1989,6 @@
* :attr:`st_ctime` - platform dependent; time of most recent metadata change on
Unix, or the time of creation on Windows)
- :attr:`st_atime`, :attr:`st_mtime` and :attr:`st_ctime` are :class:`float`
- by default, or :class:`int` if :func:`os.stat_float_times` is ``False``. Set
- the *timestamp* argument to get another :ref:`timestamp type
- <timestamp-types>`.
-
On some Unix systems (such as Linux), the following attributes may also be
available:
@@ -2055,9 +2044,6 @@
Availability: Unix, Windows.
- .. versionchanged:: 3.3
- Added the *timestamp* argument.
-
.. function:: stat_float_times([newvalue])
@@ -2083,9 +2069,6 @@
are processed, this application should turn the feature off until the library
has been corrected.
- .. deprecated:: 3.3
- Use *timestamp* argument of stat functions instead.
-
.. function:: statvfs(path)
@@ -2876,39 +2859,27 @@
with :const:`P_NOWAIT` return suitable process handles.
-.. function:: wait3(options[, timestamp=float])
+.. function:: wait3([options])
Similar to :func:`waitpid`, except no process id argument is given and a
3-element tuple containing the child's process id, exit status indication, and
resource usage information is returned. Refer to :mod:`resource`.\
:func:`getrusage` for details on resource usage information. The option
argument is the same as that provided to :func:`waitpid` and :func:`wait4`.
- :attr:`ru_utime` and :attr:`ru_stime` attributes of the resource usage are
- :class:`float` by default, set the *timestamp* argument to get another
- :ref:`timestamp type <timestamp-types>`.
Availability: Unix.
- .. versionchanged:: 3.3
- Added the *timestamp* argument.
-
-.. function:: wait4(pid, options[, timestamp=float])
+.. function:: wait4(pid, options)
Similar to :func:`waitpid`, except a 3-element tuple, containing the child's
process id, exit status indication, and resource usage information is returned.
Refer to :mod:`resource`.\ :func:`getrusage` for details on resource usage
information. The arguments to :func:`wait4` are the same as those provided to
:func:`waitpid`.
- :attr:`ru_utime` and :attr:`ru_stime` attributes of the resource usage are
- :class:`float` by default, set the *timestamp* argument to get another
- :ref:`timestamp type <timestamp-types>`.
Availability: Unix.
- .. versionchanged:: 3.3
- Added the *timestamp* argument.
-
.. data:: WNOHANG
diff --git a/Doc/library/time.rst b/Doc/library/time.rst
index 73a9518..7865b5a 100644
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -95,14 +95,6 @@
| local time | | |
+-------------------------+-------------------------+-------------------------+
-.. _timestamp-types:
-
-* Python supports the following timestamp types:
-
- * :class:`int`
- * :class:`float`
- * :class:`decimal.Decimal`
-
The module defines the following functions and data items:
@@ -127,7 +119,7 @@
trailing newline.
-.. function:: clock(timestamp=float)
+.. function:: clock()
.. index::
single: CPU time
@@ -144,27 +136,16 @@
:c:func:`QueryPerformanceCounter`. The resolution is typically better than one
microsecond.
- Return as a floating point number by default, set the *timestamp* argument
- to get another :ref:`timestamp type <timestamp-types>`.
- .. versionchanged:: 3.3
- Added the *timestamp* argument.
-
-
-.. function:: clock_getres(clk_id, timestamp=float)
+.. function:: clock_getres(clk_id)
Return the resolution (precision) of the specified clock *clk_id*.
- Return a floating point number by default, set the *timestamp* argument to
- get another :ref:`timestamp type <timestamp-types>`.
-
.. versionadded:: 3.3
-.. function:: clock_gettime(clk_id, timestamp=float)
+.. function:: clock_gettime(clk_id)
Return the time of the specified clock *clk_id*.
- Return a floating point number by default, set the *timestamp* argument to
- get another :ref:`timestamp type <timestamp-types>`.
.. versionadded:: 3.3
@@ -233,22 +214,19 @@
flag is set to ``1`` when DST applies to the given time.
-.. function:: mktime(t, timestamp=float)
+.. function:: mktime(t)
This is the inverse function of :func:`localtime`. Its argument is the
:class:`struct_time` or full 9-tuple (since the dst flag is needed; use ``-1``
as the dst flag if it is unknown) which expresses the time in *local* time, not
- It returns a floating point number by default, for compatibility with
- :func:`time`, set the *timestamp* argument to get another :ref:`timestamp
- type <timestamp-types>`.
-
+ UTC. It returns a floating point number, for compatibility with :func:`time`.
If the input value cannot be represented as a valid time, either
:exc:`OverflowError` or :exc:`ValueError` will be raised (which depends on
whether the invalid value is caught by Python or the underlying C libraries).
The earliest date for which it can generate a time is platform-dependent.
-.. function:: monotonic(timestamp=float)
+.. function:: monotonic()
Monotonic clock. The reference point of the returned value is undefined so
only the difference of consecutive calls is valid.
@@ -462,20 +440,15 @@
:exc:`TypeError` is raised.
-.. function:: time(timestamp=float)
+.. function:: time()
- Return the time expressed in seconds since the epoch in UTC. Return a
- floating point number by default, set the *timestamp* argument to get
- another :ref:`timestamp type <timestamp-types>`.
- Note that even though the time is always returned as a floating point
+ Return the time as a floating point number expressed in seconds since the epoch,
+ in UTC. Note that even though the time is always returned as a floating point
number, not all systems provide time with a better precision than 1 second.
While this function normally returns non-decreasing values, it can return a
lower value than a previous call if the system clock has been set back between
the two calls.
- .. versionchanged:: 3.3
- Added the *timestamp* argument.
-
.. data:: timezone
@@ -573,16 +546,13 @@
('EET', 'EEST')
-.. function:: wallclock(timestamp=float)
+.. function:: wallclock()
.. index::
single: Wallclock
single: benchmarking
Return the current time in fractions of a second to the system's best ability.
- Return a floating point number by default, set the *timestamp* argument to
- get another :ref:`timestamp type <timestamp-types>`.
-
Use this when the most accurate representation of wall-clock is required, i.e.
when "processor time" is inappropriate. The reference point of the returned
value is undefined so only the difference of consecutive calls is valid.